Fossil SCM

Merge the remaining Win32 TCHAR cleanup to trunk.

mistachkin 2012-09-23 04:41 trunk merge

Commit 33fb8891375fc74291e1e2726e8079d378733e4d

Parent fd05645df50e15a…

10 files changed -2 +1 -1 +1 -2 +1 -1 +1 -1 +2 -2 +30 -33 +1 -1 +1 -1 +1 -1

~ src/cgi.c ~ src/file.c ~ src/http_socket.c ~ src/main.c ~ src/main.c ~ src/makemake.tcl ~ src/winhttp.c ~ win/Makefile.mingw ~ win/Makefile.mingw.mistachkin ~ win/Makefile.msc

M src/cgi.c

-2

		--- src/cgi.c
		+++ src/cgi.c
		@@ -24,12 +24,10 @@
24	24	#include "config.h"
25	25	#ifdef _WIN32
26	26	# if defined(__MINGW32__)
27	27	# include <ws2tcpip.h>
28	28	# endif
29		-# include <windows.h> /* for Sleep once server works again */
30		-# define sleep Sleep /* windows does not have sleep, but Sleep */
31	29	#else
32	30	# include <sys/socket.h>
33	31	# include <netinet/in.h>
34	32	# include <arpa/inet.h>
35	33	# include <sys/times.h>
36	34

	--- src/cgi.c
	+++ src/cgi.c
	@@ -24,12 +24,10 @@
24	#include "config.h"
25	#ifdef _WIN32
26	# if defined(__MINGW32__)
27	# include <ws2tcpip.h>
28	# endif
29	# include <windows.h> /* for Sleep once server works again */
30	# define sleep Sleep /* windows does not have sleep, but Sleep */
31	#else
32	# include <sys/socket.h>
33	# include <netinet/in.h>
34	# include <arpa/inet.h>
35	# include <sys/times.h>
36

	--- src/cgi.c
	+++ src/cgi.c
	@@ -24,12 +24,10 @@
24	#include "config.h"
25	#ifdef _WIN32
26	# if defined(__MINGW32__)
27	# include <ws2tcpip.h>
28	# endif


29	#else
30	# include <sys/socket.h>
31	# include <netinet/in.h>
32	# include <arpa/inet.h>
33	# include <sys/times.h>
34

M src/file.c

+1 -1

		--- src/file.c
		+++ src/file.c
		@@ -1147,11 +1147,11 @@
1147	1147	if( nChar==0 ){
1148	1148	free(zUnicode);
1149	1149	return 0;
1150	1150	}
1151	1151	zUnicode[nChar] = '\0';
1152		- WriteConsole(GetStdHandle(STD_OUTPUT_HANDLE - toStdErr), zUnicode, nChar, &dummy, 0);
	1152	+ WriteConsoleW(GetStdHandle(STD_OUTPUT_HANDLE - toStdErr), zUnicode, nChar, &dummy, 0);
1153	1153	return nChar;
1154	1154	#else
1155	1155	return -1; /* No-op on unix */
1156	1156	#endif
1157	1157	}
1158	1158

	--- src/file.c
	+++ src/file.c
	@@ -1147,11 +1147,11 @@
1147	if( nChar==0 ){
1148	free(zUnicode);
1149	return 0;
1150	}
1151	zUnicode[nChar] = '\0';
1152	WriteConsole(GetStdHandle(STD_OUTPUT_HANDLE - toStdErr), zUnicode, nChar, &dummy, 0);
1153	return nChar;
1154	#else
1155	return -1; /* No-op on unix */
1156	#endif
1157	}
1158

	--- src/file.c
	+++ src/file.c
	@@ -1147,11 +1147,11 @@
1147	if( nChar==0 ){
1148	free(zUnicode);
1149	return 0;
1150	}
1151	zUnicode[nChar] = '\0';
1152	WriteConsoleW(GetStdHandle(STD_OUTPUT_HANDLE - toStdErr), zUnicode, nChar, &dummy, 0);
1153	return nChar;
1154	#else
1155	return -1; /* No-op on unix */
1156	#endif
1157	}
1158

M src/http_socket.c

+1 -2

		--- src/http_socket.c
		+++ src/http_socket.c
		@@ -30,12 +30,11 @@
30	30	#include "http_socket.h"
31	31	#if defined(_WIN32)
32	32	# if defined(__MINGW32__)
33	33	# include <ws2tcpip.h>
34	34	# endif
35		-# include <windows.h> /* for Sleep once server works again */
36		-# define sleep Sleep /* windows does not have sleep, but Sleep */
	35	+# include <windows.h>
37	36	#else
38	37	# include <netinet/in.h>
39	38	# include <arpa/inet.h>
40	39	# include <sys/socket.h>
41	40	# include <netdb.h>
42	41

	--- src/http_socket.c
	+++ src/http_socket.c
	@@ -30,12 +30,11 @@
30	#include "http_socket.h"
31	#if defined(_WIN32)
32	# if defined(__MINGW32__)
33	# include <ws2tcpip.h>
34	# endif
35	# include <windows.h> /* for Sleep once server works again */
36	# define sleep Sleep /* windows does not have sleep, but Sleep */
37	#else
38	# include <netinet/in.h>
39	# include <arpa/inet.h>
40	# include <sys/socket.h>
41	# include <netdb.h>
42

	--- src/http_socket.c
	+++ src/http_socket.c
	@@ -30,12 +30,11 @@
30	#include "http_socket.h"
31	#if defined(_WIN32)
32	# if defined(__MINGW32__)
33	# include <ws2tcpip.h>
34	# endif
35	# include <windows.h>

36	#else
37	# include <netinet/in.h>
38	# include <arpa/inet.h>
39	# include <sys/socket.h>
40	# include <netdb.h>
41

M src/main.c

+1 -1

		--- src/main.c
		+++ src/main.c
		@@ -368,11 +368,11 @@
368	368	){
369	369	WCHAR cmdLine, p, arg, argSpace;
370	370	WCHAR **argv;
371	371	int argc, size, inquote, copy, slashes;
372	372
373		- cmdLine = GetCommandLine();
	373	+ cmdLine = GetCommandLineW();
374	374
375	375	/*
376	376	** Precompute an overly pessimistic guess at the number of arguments in
377	377	** the command line by counting non-space spans.
378	378	*/
379	379

	--- src/main.c
	+++ src/main.c
	@@ -368,11 +368,11 @@
368	){
369	WCHAR cmdLine, p, arg, argSpace;
370	WCHAR **argv;
371	int argc, size, inquote, copy, slashes;
372
373	cmdLine = GetCommandLine();
374
375	/*
376	** Precompute an overly pessimistic guess at the number of arguments in
377	** the command line by counting non-space spans.
378	*/
379

	--- src/main.c
	+++ src/main.c
	@@ -368,11 +368,11 @@
368	){
369	WCHAR cmdLine, p, arg, argSpace;
370	WCHAR **argv;
371	int argc, size, inquote, copy, slashes;
372
373	cmdLine = GetCommandLineW();
374
375	/*
376	** Precompute an overly pessimistic guess at the number of arguments in
377	** the command line by counting non-space spans.
378	*/
379

M src/main.c

+1 -1

		--- src/main.c
		+++ src/main.c
		@@ -368,11 +368,11 @@
368	368	){
369	369	WCHAR cmdLine, p, arg, argSpace;
370	370	WCHAR **argv;
371	371	int argc, size, inquote, copy, slashes;
372	372
373		- cmdLine = GetCommandLine();
	373	+ cmdLine = GetCommandLineW();
374	374
375	375	/*
376	376	** Precompute an overly pessimistic guess at the number of arguments in
377	377	** the command line by counting non-space spans.
378	378	*/
379	379

	--- src/main.c
	+++ src/main.c
	@@ -368,11 +368,11 @@
368	){
369	WCHAR cmdLine, p, arg, argSpace;
370	WCHAR **argv;
371	int argc, size, inquote, copy, slashes;
372
373	cmdLine = GetCommandLine();
374
375	/*
376	** Precompute an overly pessimistic guess at the number of arguments in
377	** the command line by counting non-space spans.
378	*/
379

	--- src/main.c
	+++ src/main.c
	@@ -368,11 +368,11 @@
368	){
369	WCHAR cmdLine, p, arg, argSpace;
370	WCHAR **argv;
371	int argc, size, inquote, copy, slashes;
372
373	cmdLine = GetCommandLineW();
374
375	/*
376	** Precompute an overly pessimistic guess at the number of arguments in
377	** the command line by counting non-space spans.
378	*/
379

M src/makemake.tcl

+2 -2

		--- src/makemake.tcl
		+++ src/makemake.tcl
		@@ -432,11 +432,11 @@
432	432	# will run on the target platform. This is usually the same
433	433	# as BCC, unless you are cross-compiling. This C compiler builds
434	434	# the finished binary for fossil. The BCC compiler above is used
435	435	# for building intermediate code-generator tools.
436	436	#
437		-TCC = $(PREFIX)gcc -Os -Wall -DUNICODE -D_UNICODE -L$(ZLIBDIR) -I$(ZINCDIR)
	437	+TCC = $(PREFIX)gcc -Os -Wall -L$(ZLIBDIR) -I$(ZINCDIR)
438	438
439	439	#### Compile resources for use in building executables that will run
440	440	# on the target platform.
441	441	#
442	442	RCC = $(PREFIX)windres -I$(SRCDIR) -I$(ZINCDIR)
		@@ -903,11 +903,11 @@
903	903
904	904	INCL = -I. -I$(SRCDIR) -I$B\win\include -I$(MSCDIR)\extra\include -I$(ZINCDIR)
905	905
906	906	CFLAGS = -nologo -MT -O2
907	907	BCC = $(CC) $(CFLAGS)
908		-TCC = $(CC) -c $(CFLAGS) -DUNICODE -D_UNICODE $(MSCDEF) $(SSL) $(INCL)
	908	+TCC = $(CC) -c $(CFLAGS) $(MSCDEF) $(SSL) $(INCL)
909	909	LIBS = $(ZLIB) ws2_32.lib advapi32.lib $(SSLLIB)
910	910	LIBDIR = -LIBPATH:$(MSCDIR)\extra\lib -LIBPATH:$(ZLIBDIR)
911	911	}
912	912	regsub -all {[-]D} $SQLITE_OPTIONS {/D} MSC_SQLITE_OPTIONS
913	913	writeln "SQLITE_OPTIONS = $MSC_SQLITE_OPTIONS\n"
914	914

	--- src/makemake.tcl
	+++ src/makemake.tcl
	@@ -432,11 +432,11 @@
432	# will run on the target platform. This is usually the same
433	# as BCC, unless you are cross-compiling. This C compiler builds
434	# the finished binary for fossil. The BCC compiler above is used
435	# for building intermediate code-generator tools.
436	#
437	TCC = $(PREFIX)gcc -Os -Wall -DUNICODE -D_UNICODE -L$(ZLIBDIR) -I$(ZINCDIR)
438
439	#### Compile resources for use in building executables that will run
440	# on the target platform.
441	#
442	RCC = $(PREFIX)windres -I$(SRCDIR) -I$(ZINCDIR)
	@@ -903,11 +903,11 @@
903
904	INCL = -I. -I$(SRCDIR) -I$B\win\include -I$(MSCDIR)\extra\include -I$(ZINCDIR)
905
906	CFLAGS = -nologo -MT -O2
907	BCC = $(CC) $(CFLAGS)
908	TCC = $(CC) -c $(CFLAGS) -DUNICODE -D_UNICODE $(MSCDEF) $(SSL) $(INCL)
909	LIBS = $(ZLIB) ws2_32.lib advapi32.lib $(SSLLIB)
910	LIBDIR = -LIBPATH:$(MSCDIR)\extra\lib -LIBPATH:$(ZLIBDIR)
911	}
912	regsub -all {[-]D} $SQLITE_OPTIONS {/D} MSC_SQLITE_OPTIONS
913	writeln "SQLITE_OPTIONS = $MSC_SQLITE_OPTIONS\n"
914

	--- src/makemake.tcl
	+++ src/makemake.tcl
	@@ -432,11 +432,11 @@
432	# will run on the target platform. This is usually the same
433	# as BCC, unless you are cross-compiling. This C compiler builds
434	# the finished binary for fossil. The BCC compiler above is used
435	# for building intermediate code-generator tools.
436	#
437	TCC = $(PREFIX)gcc -Os -Wall -L$(ZLIBDIR) -I$(ZINCDIR)
438
439	#### Compile resources for use in building executables that will run
440	# on the target platform.
441	#
442	RCC = $(PREFIX)windres -I$(SRCDIR) -I$(ZINCDIR)
	@@ -903,11 +903,11 @@
903
904	INCL = -I. -I$(SRCDIR) -I$B\win\include -I$(MSCDIR)\extra\include -I$(ZINCDIR)
905
906	CFLAGS = -nologo -MT -O2
907	BCC = $(CC) $(CFLAGS)
908	TCC = $(CC) -c $(CFLAGS) $(MSCDEF) $(SSL) $(INCL)
909	LIBS = $(ZLIB) ws2_32.lib advapi32.lib $(SSLLIB)
910	LIBDIR = -LIBPATH:$(MSCDIR)\extra\lib -LIBPATH:$(ZLIBDIR)
911	}
912	regsub -all {[-]D} $SQLITE_OPTIONS {/D} MSC_SQLITE_OPTIONS
913	writeln "SQLITE_OPTIONS = $MSC_SQLITE_OPTIONS\n"
914

M src/winhttp.c

+30 -33

		--- src/winhttp.c
		+++ src/winhttp.c
		@@ -191,11 +191,11 @@
191	191	}else{
192	192	fossil_fatal("unable to open listening socket on any"
193	193	" port in the range %d..%d", mnPort, mxPort);
194	194	}
195	195	}
196		- if( !GetTempPath(MAX_PATH, zTmpPath) ){
	196	+ if( !GetTempPathW(MAX_PATH, zTmpPath) ){
197	197	fossil_fatal("unable to get path to the temporary directory.");
198	198	}
199	199	zTempPrefix = mprintf("%sfossil_server_P%d_", fossil_unicode_to_utf8(zTmpPath), iPort);
200	200	fossil_print("Listening for HTTP requests on TCP port %d\n", iPort);
201	201	if( zBrowser ){
		@@ -268,35 +268,35 @@
268	268	** to store the message string when done.
269	269	*/
270	270	static char *win32_get_last_errmsg(void){
271	271	DWORD nMsg;
272	272	DWORD nErr = GetLastError();
273		- LPTSTR tmp = NULL;
	273	+ LPWSTR tmp = NULL;
274	274	char *zMsg = NULL;
275	275
276	276	/* Try first to get the error text in english. */
277		- nMsg = FormatMessage(
	277	+ nMsg = FormatMessageW(
278	278	FORMAT_MESSAGE_ALLOCATE_BUFFER \|
279	279	FORMAT_MESSAGE_FROM_SYSTEM \|
280	280	FORMAT_MESSAGE_IGNORE_INSERTS,
281	281	NULL,
282	282	nErr,
283	283	MAKELANGID(LANG_ENGLISH, SUBLANG_ENGLISH_US),
284		- (LPTSTR) &tmp,
	284	+ (LPWSTR) &tmp,
285	285	0,
286	286	NULL
287	287	);
288	288	if( !nMsg ){
289	289	/* No english, get what the system has available. */
290		- nMsg = FormatMessage(
	290	+ nMsg = FormatMessageW(
291	291	FORMAT_MESSAGE_ALLOCATE_BUFFER \|
292	292	FORMAT_MESSAGE_FROM_SYSTEM \|
293	293	FORMAT_MESSAGE_IGNORE_INSERTS,
294	294	NULL,
295	295	nErr,
296	296	0,
297		- (LPTSTR) &tmp,
	297	+ (LPWSTR) &tmp,
298	298	0,
299	299	NULL
300	300	);
301	301	}
302	302	if( nMsg ){
		@@ -374,21 +374,21 @@
374	374	** creates a new thread to execute the ServiceMain function (this function)
375	375	** of the service being started.
376	376	*/
377	377	static void WINAPI win32_http_service_main(
378	378	DWORD argc, /* Number of arguments in argv */
379		- LPTSTR argv / Arguments passed */
	379	+ LPWSTR argv / Arguments passed */
380	380	){
381	381
382	382	/* Update the service information. */
383	383	hsData.isRunningAsService = 1;
384	384	if( argc>0 ){
385	385	hsData.zServiceName = argv[0];
386	386	}
387	387
388	388	/* Register the service control handler function */
389		- sshStatusHandle = RegisterServiceCtrlHandler(L"", win32_http_service_ctrl);
	389	+ sshStatusHandle = RegisterServiceCtrlHandlerW(L"", win32_http_service_ctrl);
390	390	if( !sshStatusHandle ){
391	391	win32_report_service_status(SERVICE_STOPPED, NO_ERROR, 0);
392	392	return;
393	393	}
394	394
		@@ -428,30 +428,29 @@
428	428	int nPort, /* TCP port number */
429	429	const char zNotFound, / The --notfound option, or NULL */
430	430	int flags /* One or more HTTP_SERVER_ flags */
431	431	){
432	432	/* Define the service table. */
433		- SERVICE_TABLE_ENTRY ServiceTable[] =
434		- {{L"", (LPSERVICE_MAIN_FUNCTION)win32_http_service_main}, {NULL, NULL}};
	433	+ SERVICE_TABLE_ENTRYW ServiceTable[] =
	434	+ {{L"", (LPSERVICE_MAIN_FUNCTIONW)win32_http_service_main}, {NULL, NULL}};
435	435
436	436	/* Initialize the HttpService structure. */
437	437	hsData.port = nPort;
438	438	hsData.zNotFound = zNotFound;
439	439	hsData.flags = flags;
440	440
441	441	/* Try to start the control dispatcher thread for the service. */
442		- if( !StartServiceCtrlDispatcher(ServiceTable) ){
	442	+ if( !StartServiceCtrlDispatcherW(ServiceTable) ){
443	443	if( GetLastError()==ERROR_FAILED_SERVICE_CONTROLLER_CONNECT ){
444	444	return 1;
445	445	}else{
446	446	fossil_fatal("error from StartServiceCtrlDispatcher()");
447	447	}
448	448	}
449	449	return 0;
450	450	}
451	451
452		-#ifdef _WIN32
453	452	/* dupe ifdef needed for mkindex
454	453	** COMMAND: winsrv*
455	454	** Usage: fossil winsrv METHOD ?SERVICE-NAME? ?OPTIONS?
456	455	**
457	456	** Where METHOD is one of: create delete show start stop.
		@@ -565,11 +564,11 @@
565	564	n = strlen(zMethod);
566	565
567	566	if( strncmp(zMethod, "create", n)==0 ){
568	567	SC_HANDLE hScm;
569	568	SC_HANDLE hSvc;
570		- SERVICE_DESCRIPTION
	569	+ SERVICE_DESCRIPTIONW
571	570	svcDescr = {L"Fossil - Distributed Software Configuration Management"};
572	571	char *zErrFmt = "unable to create service '%s': %s";
573	572	DWORD dwStartType = SERVICE_DEMAND_START;
574	573	const char *zDisplay = find_option("display", "D", 1);
575	574	const char *zStart = find_option("start", "S", 1);
		@@ -621,13 +620,13 @@
621	620	if( zPort ) blob_appendf(&binPath, " --port %s", zPort);
622	621	if( zNotFound ) blob_appendf(&binPath, " --notfound \"%s\"", zNotFound);
623	622	if( zLocalAuth ) blob_append(&binPath, " --localauth", -1);
624	623	blob_appendf(&binPath, " \"%s\"", g.zRepositoryName);
625	624	/* Create the service. */
626		- hScm = OpenSCManager(NULL, NULL, SC_MANAGER_ALL_ACCESS);
	625	+ hScm = OpenSCManagerW(NULL, NULL, SC_MANAGER_ALL_ACCESS);
627	626	if( !hScm ) fossil_fatal(zErrFmt, zSvcName, win32_get_last_errmsg());
628		- hSvc = CreateService(
	627	+ hSvc = CreateServiceW(
629	628	hScm, /* Handle to the SCM */
630	629	fossil_utf8_to_unicode(zSvcName), /* Name of the service */
631	630	fossil_utf8_to_unicode(zDisplay), /* Display name */
632	631	SERVICE_ALL_ACCESS, /* Desired access */
633	632	SERVICE_WIN32_OWN_PROCESS, /* Service type */
		@@ -640,11 +639,11 @@
640	639	fossil_utf8_to_unicode(zUsername), /* Service account */
641	640	fossil_utf8_to_unicode(zPassword) /* Account password */
642	641	);
643	642	if( !hSvc ) fossil_fatal(zErrFmt, zSvcName, win32_get_last_errmsg());
644	643	/* Set the service description. */
645		- ChangeServiceConfig2(hSvc, SERVICE_CONFIG_DESCRIPTION, &svcDescr);
	644	+ ChangeServiceConfig2W(hSvc, SERVICE_CONFIG_DESCRIPTION, &svcDescr);
646	645	fossil_print("Service '%s' successfully created.\n", zSvcName);
647	646	CloseServiceHandle(hSvc);
648	647	CloseServiceHandle(hScm);
649	648	}else
650	649	if( strncmp(zMethod, "delete", n)==0 ){
		@@ -657,13 +656,13 @@
657	656	if( g.argc==4 ){
658	657	zSvcName = g.argv[3];
659	658	}else if( g.argc>4 ){
660	659	fossil_fatal("to much arguments for delete method.");
661	660	}
662		- hScm = OpenSCManager(NULL, NULL, SC_MANAGER_ALL_ACCESS);
	661	+ hScm = OpenSCManagerW(NULL, NULL, SC_MANAGER_ALL_ACCESS);
663	662	if( !hScm ) fossil_fatal(zErrFmt, zSvcName, win32_get_last_errmsg());
664		- hSvc = OpenService(hScm, fossil_utf8_to_unicode(zSvcName), SERVICE_ALL_ACCESS);
	663	+ hSvc = OpenServiceW(hScm, fossil_utf8_to_unicode(zSvcName), SERVICE_ALL_ACCESS);
665	664	if( !hSvc ) fossil_fatal(zErrFmt, zSvcName, win32_get_last_errmsg());
666	665	QueryServiceStatus(hSvc, &sstat);
667	666	if( sstat.dwCurrentState!=SERVICE_STOPPED ){
668	667	fossil_print("Stopping service '%s'", zSvcName);
669	668	if( sstat.dwCurrentState!=SERVICE_STOP_PENDING ){
		@@ -692,12 +691,12 @@
692	691	}else
693	692	if( strncmp(zMethod, "show", n)==0 ){
694	693	SC_HANDLE hScm;
695	694	SC_HANDLE hSvc;
696	695	SERVICE_STATUS sstat;
697		- LPQUERY_SERVICE_CONFIG pSvcConfig;
698		- LPSERVICE_DESCRIPTION pSvcDescr;
	696	+ LPQUERY_SERVICE_CONFIGW pSvcConfig;
	697	+ LPSERVICE_DESCRIPTIONW pSvcDescr;
699	698	BOOL bStatus;
700	699	DWORD nRequired;
701	700	const char *zErrFmt = "unable to show service '%s': %s";
702	701	static const char *const zSvcTypes[] = {
703	702	"Driver service",
		@@ -725,21 +724,21 @@
725	724	if( g.argc==4 ){
726	725	zSvcName = g.argv[3];
727	726	}else if( g.argc>4 ){
728	727	fossil_fatal("to much arguments for show method.");
729	728	}
730		- hScm = OpenSCManager(NULL, NULL, GENERIC_READ);
	729	+ hScm = OpenSCManagerW(NULL, NULL, GENERIC_READ);
731	730	if( !hScm ) fossil_fatal(zErrFmt, zSvcName, win32_get_last_errmsg());
732		- hSvc = OpenService(hScm, fossil_utf8_to_unicode(zSvcName), GENERIC_READ);
	731	+ hSvc = OpenServiceW(hScm, fossil_utf8_to_unicode(zSvcName), GENERIC_READ);
733	732	if( !hSvc ) fossil_fatal(zErrFmt, zSvcName, win32_get_last_errmsg());
734	733	/* Get the service configuration */
735		- bStatus = QueryServiceConfig(hSvc, NULL, 0, &nRequired);
	734	+ bStatus = QueryServiceConfigW(hSvc, NULL, 0, &nRequired);
736	735	if( !bStatus && GetLastError()!=ERROR_INSUFFICIENT_BUFFER ){
737	736	fossil_fatal(zErrFmt, zSvcName, win32_get_last_errmsg());
738	737	}
739	738	pSvcConfig = fossil_malloc(nRequired);
740		- bStatus = QueryServiceConfig(hSvc, pSvcConfig, nRequired, &nRequired);
	739	+ bStatus = QueryServiceConfigW(hSvc, pSvcConfig, nRequired, &nRequired);
741	740	if( !bStatus ) fossil_fatal(zErrFmt, zSvcName, win32_get_last_errmsg());
742	741	/* Translate the service type */
743	742	switch( pSvcConfig->dwServiceType ){
744	743	case SERVICE_KERNEL_DRIVER: zSvcType = zSvcTypes[0]; break;
745	744	case SERVICE_FILE_SYSTEM_DRIVER: zSvcType = zSvcTypes[1]; break;
		@@ -754,17 +753,17 @@
754	753	case SERVICE_AUTO_START: zSvcStartType = zSvcStartTypes[2]; break;
755	754	case SERVICE_DEMAND_START: zSvcStartType = zSvcStartTypes[3]; break;
756	755	case SERVICE_DISABLED: zSvcStartType = zSvcStartTypes[4]; break;
757	756	}
758	757	/* Get the service description. */
759		- bStatus = QueryServiceConfig2(hSvc, SERVICE_CONFIG_DESCRIPTION,
	758	+ bStatus = QueryServiceConfig2W(hSvc, SERVICE_CONFIG_DESCRIPTION,
760	759	NULL, 0, &nRequired);
761	760	if( !bStatus && GetLastError()!=ERROR_INSUFFICIENT_BUFFER ){
762	761	fossil_fatal(zErrFmt, zSvcName, win32_get_last_errmsg());
763	762	}
764	763	pSvcDescr = fossil_malloc(nRequired);
765		- bStatus = QueryServiceConfig2(hSvc, SERVICE_CONFIG_DESCRIPTION,
	764	+ bStatus = QueryServiceConfig2W(hSvc, SERVICE_CONFIG_DESCRIPTION,
766	765	(LPBYTE)pSvcDescr, nRequired, &nRequired);
767	766	if( !bStatus ) fossil_fatal(zErrFmt, zSvcName, win32_get_last_errmsg());
768	767	/* Retrieves the current status of the specified service. */
769	768	bStatus = QueryServiceStatus(hSvc, &sstat);
770	769	if( !bStatus ) fossil_fatal(zErrFmt, zSvcName, win32_get_last_errmsg());
		@@ -807,19 +806,19 @@
807	806	if( g.argc==4 ){
808	807	zSvcName = g.argv[3];
809	808	}else if( g.argc>4 ){
810	809	fossil_fatal("to much arguments for start method.");
811	810	}
812		- hScm = OpenSCManager(NULL, NULL, SC_MANAGER_ALL_ACCESS);
	811	+ hScm = OpenSCManagerW(NULL, NULL, SC_MANAGER_ALL_ACCESS);
813	812	if( !hScm ) fossil_fatal(zErrFmt, zSvcName, win32_get_last_errmsg());
814		- hSvc = OpenService(hScm, fossil_utf8_to_unicode(zSvcName), SERVICE_ALL_ACCESS);
	813	+ hSvc = OpenServiceW(hScm, fossil_utf8_to_unicode(zSvcName), SERVICE_ALL_ACCESS);
815	814	if( !hSvc ) fossil_fatal(zErrFmt, zSvcName, win32_get_last_errmsg());
816	815	QueryServiceStatus(hSvc, &sstat);
817	816	if( sstat.dwCurrentState!=SERVICE_RUNNING ){
818	817	fossil_print("Starting service '%s'", zSvcName);
819	818	if( sstat.dwCurrentState!=SERVICE_START_PENDING ){
820		- if( !StartService(hSvc, 0, NULL) ){
	819	+ if( !StartServiceW(hSvc, 0, NULL) ){
821	820	fossil_fatal(zErrFmt, zSvcName, win32_get_last_errmsg());
822	821	}
823	822	}
824	823	while( sstat.dwCurrentState!=SERVICE_RUNNING ){
825	824	Sleep(100);
		@@ -843,13 +842,13 @@
843	842	if( g.argc==4 ){
844	843	zSvcName = g.argv[3];
845	844	}else if( g.argc>4 ){
846	845	fossil_fatal("to much arguments for stop method.");
847	846	}
848		- hScm = OpenSCManager(NULL, NULL, SC_MANAGER_ALL_ACCESS);
	847	+ hScm = OpenSCManagerW(NULL, NULL, SC_MANAGER_ALL_ACCESS);
849	848	if( !hScm ) fossil_fatal(zErrFmt, zSvcName, win32_get_last_errmsg());
850		- hSvc = OpenService(hScm, fossil_utf8_to_unicode(zSvcName), SERVICE_ALL_ACCESS);
	849	+ hSvc = OpenServiceW(hScm, fossil_utf8_to_unicode(zSvcName), SERVICE_ALL_ACCESS);
851	850	if( !hSvc ) fossil_fatal(zErrFmt, zSvcName, win32_get_last_errmsg());
852	851	QueryServiceStatus(hSvc, &sstat);
853	852	if( sstat.dwCurrentState!=SERVICE_STOPPED ){
854	853	fossil_print("Stopping service '%s'", zSvcName);
855	854	if( sstat.dwCurrentState!=SERVICE_STOP_PENDING ){
		@@ -873,8 +872,6 @@
873	872	fossil_fatal("METHOD should be one of:"
874	873	" create delete show start stop");
875	874	}
876	875	return;
877	876	}
878		-#endif /* _WIN32 */
879		-
880	877	#endif /* _WIN32 -- This code is for win32 only */
881	878

	--- src/winhttp.c
	+++ src/winhttp.c
	@@ -191,11 +191,11 @@
191	}else{
192	fossil_fatal("unable to open listening socket on any"
193	" port in the range %d..%d", mnPort, mxPort);
194	}
195	}
196	if( !GetTempPath(MAX_PATH, zTmpPath) ){
197	fossil_fatal("unable to get path to the temporary directory.");
198	}
199	zTempPrefix = mprintf("%sfossil_server_P%d_", fossil_unicode_to_utf8(zTmpPath), iPort);
200	fossil_print("Listening for HTTP requests on TCP port %d\n", iPort);
201	if( zBrowser ){
	@@ -268,35 +268,35 @@
268	** to store the message string when done.
269	*/
270	static char *win32_get_last_errmsg(void){
271	DWORD nMsg;
272	DWORD nErr = GetLastError();
273	LPTSTR tmp = NULL;
274	char *zMsg = NULL;
275
276	/* Try first to get the error text in english. */
277	nMsg = FormatMessage(
278	FORMAT_MESSAGE_ALLOCATE_BUFFER \|
279	FORMAT_MESSAGE_FROM_SYSTEM \|
280	FORMAT_MESSAGE_IGNORE_INSERTS,
281	NULL,
282	nErr,
283	MAKELANGID(LANG_ENGLISH, SUBLANG_ENGLISH_US),
284	(LPTSTR) &tmp,
285	0,
286	NULL
287	);
288	if( !nMsg ){
289	/* No english, get what the system has available. */
290	nMsg = FormatMessage(
291	FORMAT_MESSAGE_ALLOCATE_BUFFER \|
292	FORMAT_MESSAGE_FROM_SYSTEM \|
293	FORMAT_MESSAGE_IGNORE_INSERTS,
294	NULL,
295	nErr,
296	0,
297	(LPTSTR) &tmp,
298	0,
299	NULL
300	);
301	}
302	if( nMsg ){
	@@ -374,21 +374,21 @@
374	** creates a new thread to execute the ServiceMain function (this function)
375	** of the service being started.
376	*/
377	static void WINAPI win32_http_service_main(
378	DWORD argc, /* Number of arguments in argv */
379	LPTSTR argv / Arguments passed */
380	){
381
382	/* Update the service information. */
383	hsData.isRunningAsService = 1;
384	if( argc>0 ){
385	hsData.zServiceName = argv[0];
386	}
387
388	/* Register the service control handler function */
389	sshStatusHandle = RegisterServiceCtrlHandler(L"", win32_http_service_ctrl);
390	if( !sshStatusHandle ){
391	win32_report_service_status(SERVICE_STOPPED, NO_ERROR, 0);
392	return;
393	}
394
	@@ -428,30 +428,29 @@
428	int nPort, /* TCP port number */
429	const char zNotFound, / The --notfound option, or NULL */
430	int flags /* One or more HTTP_SERVER_ flags */
431	){
432	/* Define the service table. */
433	SERVICE_TABLE_ENTRY ServiceTable[] =
434	{{L"", (LPSERVICE_MAIN_FUNCTION)win32_http_service_main}, {NULL, NULL}};
435
436	/* Initialize the HttpService structure. */
437	hsData.port = nPort;
438	hsData.zNotFound = zNotFound;
439	hsData.flags = flags;
440
441	/* Try to start the control dispatcher thread for the service. */
442	if( !StartServiceCtrlDispatcher(ServiceTable) ){
443	if( GetLastError()==ERROR_FAILED_SERVICE_CONTROLLER_CONNECT ){
444	return 1;
445	}else{
446	fossil_fatal("error from StartServiceCtrlDispatcher()");
447	}
448	}
449	return 0;
450	}
451
452	#ifdef _WIN32
453	/* dupe ifdef needed for mkindex
454	** COMMAND: winsrv*
455	** Usage: fossil winsrv METHOD ?SERVICE-NAME? ?OPTIONS?
456	**
457	** Where METHOD is one of: create delete show start stop.
	@@ -565,11 +564,11 @@
565	n = strlen(zMethod);
566
567	if( strncmp(zMethod, "create", n)==0 ){
568	SC_HANDLE hScm;
569	SC_HANDLE hSvc;
570	SERVICE_DESCRIPTION
571	svcDescr = {L"Fossil - Distributed Software Configuration Management"};
572	char *zErrFmt = "unable to create service '%s': %s";
573	DWORD dwStartType = SERVICE_DEMAND_START;
574	const char *zDisplay = find_option("display", "D", 1);
575	const char *zStart = find_option("start", "S", 1);
	@@ -621,13 +620,13 @@
621	if( zPort ) blob_appendf(&binPath, " --port %s", zPort);
622	if( zNotFound ) blob_appendf(&binPath, " --notfound \"%s\"", zNotFound);
623	if( zLocalAuth ) blob_append(&binPath, " --localauth", -1);
624	blob_appendf(&binPath, " \"%s\"", g.zRepositoryName);
625	/* Create the service. */
626	hScm = OpenSCManager(NULL, NULL, SC_MANAGER_ALL_ACCESS);
627	if( !hScm ) fossil_fatal(zErrFmt, zSvcName, win32_get_last_errmsg());
628	hSvc = CreateService(
629	hScm, /* Handle to the SCM */
630	fossil_utf8_to_unicode(zSvcName), /* Name of the service */
631	fossil_utf8_to_unicode(zDisplay), /* Display name */
632	SERVICE_ALL_ACCESS, /* Desired access */
633	SERVICE_WIN32_OWN_PROCESS, /* Service type */
	@@ -640,11 +639,11 @@
640	fossil_utf8_to_unicode(zUsername), /* Service account */
641	fossil_utf8_to_unicode(zPassword) /* Account password */
642	);
643	if( !hSvc ) fossil_fatal(zErrFmt, zSvcName, win32_get_last_errmsg());
644	/* Set the service description. */
645	ChangeServiceConfig2(hSvc, SERVICE_CONFIG_DESCRIPTION, &svcDescr);
646	fossil_print("Service '%s' successfully created.\n", zSvcName);
647	CloseServiceHandle(hSvc);
648	CloseServiceHandle(hScm);
649	}else
650	if( strncmp(zMethod, "delete", n)==0 ){
	@@ -657,13 +656,13 @@
657	if( g.argc==4 ){
658	zSvcName = g.argv[3];
659	}else if( g.argc>4 ){
660	fossil_fatal("to much arguments for delete method.");
661	}
662	hScm = OpenSCManager(NULL, NULL, SC_MANAGER_ALL_ACCESS);
663	if( !hScm ) fossil_fatal(zErrFmt, zSvcName, win32_get_last_errmsg());
664	hSvc = OpenService(hScm, fossil_utf8_to_unicode(zSvcName), SERVICE_ALL_ACCESS);
665	if( !hSvc ) fossil_fatal(zErrFmt, zSvcName, win32_get_last_errmsg());
666	QueryServiceStatus(hSvc, &sstat);
667	if( sstat.dwCurrentState!=SERVICE_STOPPED ){
668	fossil_print("Stopping service '%s'", zSvcName);
669	if( sstat.dwCurrentState!=SERVICE_STOP_PENDING ){
	@@ -692,12 +691,12 @@
692	}else
693	if( strncmp(zMethod, "show", n)==0 ){
694	SC_HANDLE hScm;
695	SC_HANDLE hSvc;
696	SERVICE_STATUS sstat;
697	LPQUERY_SERVICE_CONFIG pSvcConfig;
698	LPSERVICE_DESCRIPTION pSvcDescr;
699	BOOL bStatus;
700	DWORD nRequired;
701	const char *zErrFmt = "unable to show service '%s': %s";
702	static const char *const zSvcTypes[] = {
703	"Driver service",
	@@ -725,21 +724,21 @@
725	if( g.argc==4 ){
726	zSvcName = g.argv[3];
727	}else if( g.argc>4 ){
728	fossil_fatal("to much arguments for show method.");
729	}
730	hScm = OpenSCManager(NULL, NULL, GENERIC_READ);
731	if( !hScm ) fossil_fatal(zErrFmt, zSvcName, win32_get_last_errmsg());
732	hSvc = OpenService(hScm, fossil_utf8_to_unicode(zSvcName), GENERIC_READ);
733	if( !hSvc ) fossil_fatal(zErrFmt, zSvcName, win32_get_last_errmsg());
734	/* Get the service configuration */
735	bStatus = QueryServiceConfig(hSvc, NULL, 0, &nRequired);
736	if( !bStatus && GetLastError()!=ERROR_INSUFFICIENT_BUFFER ){
737	fossil_fatal(zErrFmt, zSvcName, win32_get_last_errmsg());
738	}
739	pSvcConfig = fossil_malloc(nRequired);
740	bStatus = QueryServiceConfig(hSvc, pSvcConfig, nRequired, &nRequired);
741	if( !bStatus ) fossil_fatal(zErrFmt, zSvcName, win32_get_last_errmsg());
742	/* Translate the service type */
743	switch( pSvcConfig->dwServiceType ){
744	case SERVICE_KERNEL_DRIVER: zSvcType = zSvcTypes[0]; break;
745	case SERVICE_FILE_SYSTEM_DRIVER: zSvcType = zSvcTypes[1]; break;
	@@ -754,17 +753,17 @@
754	case SERVICE_AUTO_START: zSvcStartType = zSvcStartTypes[2]; break;
755	case SERVICE_DEMAND_START: zSvcStartType = zSvcStartTypes[3]; break;
756	case SERVICE_DISABLED: zSvcStartType = zSvcStartTypes[4]; break;
757	}
758	/* Get the service description. */
759	bStatus = QueryServiceConfig2(hSvc, SERVICE_CONFIG_DESCRIPTION,
760	NULL, 0, &nRequired);
761	if( !bStatus && GetLastError()!=ERROR_INSUFFICIENT_BUFFER ){
762	fossil_fatal(zErrFmt, zSvcName, win32_get_last_errmsg());
763	}
764	pSvcDescr = fossil_malloc(nRequired);
765	bStatus = QueryServiceConfig2(hSvc, SERVICE_CONFIG_DESCRIPTION,
766	(LPBYTE)pSvcDescr, nRequired, &nRequired);
767	if( !bStatus ) fossil_fatal(zErrFmt, zSvcName, win32_get_last_errmsg());
768	/* Retrieves the current status of the specified service. */
769	bStatus = QueryServiceStatus(hSvc, &sstat);
770	if( !bStatus ) fossil_fatal(zErrFmt, zSvcName, win32_get_last_errmsg());
	@@ -807,19 +806,19 @@
807	if( g.argc==4 ){
808	zSvcName = g.argv[3];
809	}else if( g.argc>4 ){
810	fossil_fatal("to much arguments for start method.");
811	}
812	hScm = OpenSCManager(NULL, NULL, SC_MANAGER_ALL_ACCESS);
813	if( !hScm ) fossil_fatal(zErrFmt, zSvcName, win32_get_last_errmsg());
814	hSvc = OpenService(hScm, fossil_utf8_to_unicode(zSvcName), SERVICE_ALL_ACCESS);
815	if( !hSvc ) fossil_fatal(zErrFmt, zSvcName, win32_get_last_errmsg());
816	QueryServiceStatus(hSvc, &sstat);
817	if( sstat.dwCurrentState!=SERVICE_RUNNING ){
818	fossil_print("Starting service '%s'", zSvcName);
819	if( sstat.dwCurrentState!=SERVICE_START_PENDING ){
820	if( !StartService(hSvc, 0, NULL) ){
821	fossil_fatal(zErrFmt, zSvcName, win32_get_last_errmsg());
822	}
823	}
824	while( sstat.dwCurrentState!=SERVICE_RUNNING ){
825	Sleep(100);
	@@ -843,13 +842,13 @@
843	if( g.argc==4 ){
844	zSvcName = g.argv[3];
845	}else if( g.argc>4 ){
846	fossil_fatal("to much arguments for stop method.");
847	}
848	hScm = OpenSCManager(NULL, NULL, SC_MANAGER_ALL_ACCESS);
849	if( !hScm ) fossil_fatal(zErrFmt, zSvcName, win32_get_last_errmsg());
850	hSvc = OpenService(hScm, fossil_utf8_to_unicode(zSvcName), SERVICE_ALL_ACCESS);
851	if( !hSvc ) fossil_fatal(zErrFmt, zSvcName, win32_get_last_errmsg());
852	QueryServiceStatus(hSvc, &sstat);
853	if( sstat.dwCurrentState!=SERVICE_STOPPED ){
854	fossil_print("Stopping service '%s'", zSvcName);
855	if( sstat.dwCurrentState!=SERVICE_STOP_PENDING ){
	@@ -873,8 +872,6 @@
873	fossil_fatal("METHOD should be one of:"
874	" create delete show start stop");
875	}
876	return;
877	}
878	#endif /* _WIN32 */
879
880	#endif /* _WIN32 -- This code is for win32 only */
881

	--- src/winhttp.c
	+++ src/winhttp.c
	@@ -191,11 +191,11 @@
191	}else{
192	fossil_fatal("unable to open listening socket on any"
193	" port in the range %d..%d", mnPort, mxPort);
194	}
195	}
196	if( !GetTempPathW(MAX_PATH, zTmpPath) ){
197	fossil_fatal("unable to get path to the temporary directory.");
198	}
199	zTempPrefix = mprintf("%sfossil_server_P%d_", fossil_unicode_to_utf8(zTmpPath), iPort);
200	fossil_print("Listening for HTTP requests on TCP port %d\n", iPort);
201	if( zBrowser ){
	@@ -268,35 +268,35 @@
268	** to store the message string when done.
269	*/
270	static char *win32_get_last_errmsg(void){
271	DWORD nMsg;
272	DWORD nErr = GetLastError();
273	LPWSTR tmp = NULL;
274	char *zMsg = NULL;
275
276	/* Try first to get the error text in english. */
277	nMsg = FormatMessageW(
278	FORMAT_MESSAGE_ALLOCATE_BUFFER \|
279	FORMAT_MESSAGE_FROM_SYSTEM \|
280	FORMAT_MESSAGE_IGNORE_INSERTS,
281	NULL,
282	nErr,
283	MAKELANGID(LANG_ENGLISH, SUBLANG_ENGLISH_US),
284	(LPWSTR) &tmp,
285	0,
286	NULL
287	);
288	if( !nMsg ){
289	/* No english, get what the system has available. */
290	nMsg = FormatMessageW(
291	FORMAT_MESSAGE_ALLOCATE_BUFFER \|
292	FORMAT_MESSAGE_FROM_SYSTEM \|
293	FORMAT_MESSAGE_IGNORE_INSERTS,
294	NULL,
295	nErr,
296	0,
297	(LPWSTR) &tmp,
298	0,
299	NULL
300	);
301	}
302	if( nMsg ){
	@@ -374,21 +374,21 @@
374	** creates a new thread to execute the ServiceMain function (this function)
375	** of the service being started.
376	*/
377	static void WINAPI win32_http_service_main(
378	DWORD argc, /* Number of arguments in argv */
379	LPWSTR argv / Arguments passed */
380	){
381
382	/* Update the service information. */
383	hsData.isRunningAsService = 1;
384	if( argc>0 ){
385	hsData.zServiceName = argv[0];
386	}
387
388	/* Register the service control handler function */
389	sshStatusHandle = RegisterServiceCtrlHandlerW(L"", win32_http_service_ctrl);
390	if( !sshStatusHandle ){
391	win32_report_service_status(SERVICE_STOPPED, NO_ERROR, 0);
392	return;
393	}
394
	@@ -428,30 +428,29 @@
428	int nPort, /* TCP port number */
429	const char zNotFound, / The --notfound option, or NULL */
430	int flags /* One or more HTTP_SERVER_ flags */
431	){
432	/* Define the service table. */
433	SERVICE_TABLE_ENTRYW ServiceTable[] =
434	{{L"", (LPSERVICE_MAIN_FUNCTIONW)win32_http_service_main}, {NULL, NULL}};
435
436	/* Initialize the HttpService structure. */
437	hsData.port = nPort;
438	hsData.zNotFound = zNotFound;
439	hsData.flags = flags;
440
441	/* Try to start the control dispatcher thread for the service. */
442	if( !StartServiceCtrlDispatcherW(ServiceTable) ){
443	if( GetLastError()==ERROR_FAILED_SERVICE_CONTROLLER_CONNECT ){
444	return 1;
445	}else{
446	fossil_fatal("error from StartServiceCtrlDispatcher()");
447	}
448	}
449	return 0;
450	}
451

452	/* dupe ifdef needed for mkindex
453	** COMMAND: winsrv*
454	** Usage: fossil winsrv METHOD ?SERVICE-NAME? ?OPTIONS?
455	**
456	** Where METHOD is one of: create delete show start stop.
	@@ -565,11 +564,11 @@
564	n = strlen(zMethod);
565
566	if( strncmp(zMethod, "create", n)==0 ){
567	SC_HANDLE hScm;
568	SC_HANDLE hSvc;
569	SERVICE_DESCRIPTIONW
570	svcDescr = {L"Fossil - Distributed Software Configuration Management"};
571	char *zErrFmt = "unable to create service '%s': %s";
572	DWORD dwStartType = SERVICE_DEMAND_START;
573	const char *zDisplay = find_option("display", "D", 1);
574	const char *zStart = find_option("start", "S", 1);
	@@ -621,13 +620,13 @@
620	if( zPort ) blob_appendf(&binPath, " --port %s", zPort);
621	if( zNotFound ) blob_appendf(&binPath, " --notfound \"%s\"", zNotFound);
622	if( zLocalAuth ) blob_append(&binPath, " --localauth", -1);
623	blob_appendf(&binPath, " \"%s\"", g.zRepositoryName);
624	/* Create the service. */
625	hScm = OpenSCManagerW(NULL, NULL, SC_MANAGER_ALL_ACCESS);
626	if( !hScm ) fossil_fatal(zErrFmt, zSvcName, win32_get_last_errmsg());
627	hSvc = CreateServiceW(
628	hScm, /* Handle to the SCM */
629	fossil_utf8_to_unicode(zSvcName), /* Name of the service */
630	fossil_utf8_to_unicode(zDisplay), /* Display name */
631	SERVICE_ALL_ACCESS, /* Desired access */
632	SERVICE_WIN32_OWN_PROCESS, /* Service type */
	@@ -640,11 +639,11 @@
639	fossil_utf8_to_unicode(zUsername), /* Service account */
640	fossil_utf8_to_unicode(zPassword) /* Account password */
641	);
642	if( !hSvc ) fossil_fatal(zErrFmt, zSvcName, win32_get_last_errmsg());
643	/* Set the service description. */
644	ChangeServiceConfig2W(hSvc, SERVICE_CONFIG_DESCRIPTION, &svcDescr);
645	fossil_print("Service '%s' successfully created.\n", zSvcName);
646	CloseServiceHandle(hSvc);
647	CloseServiceHandle(hScm);
648	}else
649	if( strncmp(zMethod, "delete", n)==0 ){
	@@ -657,13 +656,13 @@
656	if( g.argc==4 ){
657	zSvcName = g.argv[3];
658	}else if( g.argc>4 ){
659	fossil_fatal("to much arguments for delete method.");
660	}
661	hScm = OpenSCManagerW(NULL, NULL, SC_MANAGER_ALL_ACCESS);
662	if( !hScm ) fossil_fatal(zErrFmt, zSvcName, win32_get_last_errmsg());
663	hSvc = OpenServiceW(hScm, fossil_utf8_to_unicode(zSvcName), SERVICE_ALL_ACCESS);
664	if( !hSvc ) fossil_fatal(zErrFmt, zSvcName, win32_get_last_errmsg());
665	QueryServiceStatus(hSvc, &sstat);
666	if( sstat.dwCurrentState!=SERVICE_STOPPED ){
667	fossil_print("Stopping service '%s'", zSvcName);
668	if( sstat.dwCurrentState!=SERVICE_STOP_PENDING ){
	@@ -692,12 +691,12 @@
691	}else
692	if( strncmp(zMethod, "show", n)==0 ){
693	SC_HANDLE hScm;
694	SC_HANDLE hSvc;
695	SERVICE_STATUS sstat;
696	LPQUERY_SERVICE_CONFIGW pSvcConfig;
697	LPSERVICE_DESCRIPTIONW pSvcDescr;
698	BOOL bStatus;
699	DWORD nRequired;
700	const char *zErrFmt = "unable to show service '%s': %s";
701	static const char *const zSvcTypes[] = {
702	"Driver service",
	@@ -725,21 +724,21 @@
724	if( g.argc==4 ){
725	zSvcName = g.argv[3];
726	}else if( g.argc>4 ){
727	fossil_fatal("to much arguments for show method.");
728	}
729	hScm = OpenSCManagerW(NULL, NULL, GENERIC_READ);
730	if( !hScm ) fossil_fatal(zErrFmt, zSvcName, win32_get_last_errmsg());
731	hSvc = OpenServiceW(hScm, fossil_utf8_to_unicode(zSvcName), GENERIC_READ);
732	if( !hSvc ) fossil_fatal(zErrFmt, zSvcName, win32_get_last_errmsg());
733	/* Get the service configuration */
734	bStatus = QueryServiceConfigW(hSvc, NULL, 0, &nRequired);
735	if( !bStatus && GetLastError()!=ERROR_INSUFFICIENT_BUFFER ){
736	fossil_fatal(zErrFmt, zSvcName, win32_get_last_errmsg());
737	}
738	pSvcConfig = fossil_malloc(nRequired);
739	bStatus = QueryServiceConfigW(hSvc, pSvcConfig, nRequired, &nRequired);
740	if( !bStatus ) fossil_fatal(zErrFmt, zSvcName, win32_get_last_errmsg());
741	/* Translate the service type */
742	switch( pSvcConfig->dwServiceType ){
743	case SERVICE_KERNEL_DRIVER: zSvcType = zSvcTypes[0]; break;
744	case SERVICE_FILE_SYSTEM_DRIVER: zSvcType = zSvcTypes[1]; break;
	@@ -754,17 +753,17 @@
753	case SERVICE_AUTO_START: zSvcStartType = zSvcStartTypes[2]; break;
754	case SERVICE_DEMAND_START: zSvcStartType = zSvcStartTypes[3]; break;
755	case SERVICE_DISABLED: zSvcStartType = zSvcStartTypes[4]; break;
756	}
757	/* Get the service description. */
758	bStatus = QueryServiceConfig2W(hSvc, SERVICE_CONFIG_DESCRIPTION,
759	NULL, 0, &nRequired);
760	if( !bStatus && GetLastError()!=ERROR_INSUFFICIENT_BUFFER ){
761	fossil_fatal(zErrFmt, zSvcName, win32_get_last_errmsg());
762	}
763	pSvcDescr = fossil_malloc(nRequired);
764	bStatus = QueryServiceConfig2W(hSvc, SERVICE_CONFIG_DESCRIPTION,
765	(LPBYTE)pSvcDescr, nRequired, &nRequired);
766	if( !bStatus ) fossil_fatal(zErrFmt, zSvcName, win32_get_last_errmsg());
767	/* Retrieves the current status of the specified service. */
768	bStatus = QueryServiceStatus(hSvc, &sstat);
769	if( !bStatus ) fossil_fatal(zErrFmt, zSvcName, win32_get_last_errmsg());
	@@ -807,19 +806,19 @@
806	if( g.argc==4 ){
807	zSvcName = g.argv[3];
808	}else if( g.argc>4 ){
809	fossil_fatal("to much arguments for start method.");
810	}
811	hScm = OpenSCManagerW(NULL, NULL, SC_MANAGER_ALL_ACCESS);
812	if( !hScm ) fossil_fatal(zErrFmt, zSvcName, win32_get_last_errmsg());
813	hSvc = OpenServiceW(hScm, fossil_utf8_to_unicode(zSvcName), SERVICE_ALL_ACCESS);
814	if( !hSvc ) fossil_fatal(zErrFmt, zSvcName, win32_get_last_errmsg());
815	QueryServiceStatus(hSvc, &sstat);
816	if( sstat.dwCurrentState!=SERVICE_RUNNING ){
817	fossil_print("Starting service '%s'", zSvcName);
818	if( sstat.dwCurrentState!=SERVICE_START_PENDING ){
819	if( !StartServiceW(hSvc, 0, NULL) ){
820	fossil_fatal(zErrFmt, zSvcName, win32_get_last_errmsg());
821	}
822	}
823	while( sstat.dwCurrentState!=SERVICE_RUNNING ){
824	Sleep(100);
	@@ -843,13 +842,13 @@
842	if( g.argc==4 ){
843	zSvcName = g.argv[3];
844	}else if( g.argc>4 ){
845	fossil_fatal("to much arguments for stop method.");
846	}
847	hScm = OpenSCManagerW(NULL, NULL, SC_MANAGER_ALL_ACCESS);
848	if( !hScm ) fossil_fatal(zErrFmt, zSvcName, win32_get_last_errmsg());
849	hSvc = OpenServiceW(hScm, fossil_utf8_to_unicode(zSvcName), SERVICE_ALL_ACCESS);
850	if( !hSvc ) fossil_fatal(zErrFmt, zSvcName, win32_get_last_errmsg());
851	QueryServiceStatus(hSvc, &sstat);
852	if( sstat.dwCurrentState!=SERVICE_STOPPED ){
853	fossil_print("Stopping service '%s'", zSvcName);
854	if( sstat.dwCurrentState!=SERVICE_STOP_PENDING ){
	@@ -873,8 +872,6 @@
872	fossil_fatal("METHOD should be one of:"
873	" create delete show start stop");
874	}
875	return;
876	}


877	#endif /* _WIN32 -- This code is for win32 only */
878

M win/Makefile.mingw

+1 -1

		--- win/Makefile.mingw
		+++ win/Makefile.mingw
		@@ -104,11 +104,11 @@
104	104	# will run on the target platform. This is usually the same
105	105	# as BCC, unless you are cross-compiling. This C compiler builds
106	106	# the finished binary for fossil. The BCC compiler above is used
107	107	# for building intermediate code-generator tools.
108	108	#
109		-TCC = $(PREFIX)gcc -Os -Wall -DUNICODE -D_UNICODE -L$(ZLIBDIR) -I$(ZINCDIR)
	109	+TCC = $(PREFIX)gcc -Os -Wall -L$(ZLIBDIR) -I$(ZINCDIR)
110	110
111	111	#### Compile resources for use in building executables that will run
112	112	# on the target platform.
113	113	#
114	114	RCC = $(PREFIX)windres -I$(SRCDIR) -I$(ZINCDIR)
115	115

	--- win/Makefile.mingw
	+++ win/Makefile.mingw
	@@ -104,11 +104,11 @@
104	# will run on the target platform. This is usually the same
105	# as BCC, unless you are cross-compiling. This C compiler builds
106	# the finished binary for fossil. The BCC compiler above is used
107	# for building intermediate code-generator tools.
108	#
109	TCC = $(PREFIX)gcc -Os -Wall -DUNICODE -D_UNICODE -L$(ZLIBDIR) -I$(ZINCDIR)
110
111	#### Compile resources for use in building executables that will run
112	# on the target platform.
113	#
114	RCC = $(PREFIX)windres -I$(SRCDIR) -I$(ZINCDIR)
115

	--- win/Makefile.mingw
	+++ win/Makefile.mingw
	@@ -104,11 +104,11 @@
104	# will run on the target platform. This is usually the same
105	# as BCC, unless you are cross-compiling. This C compiler builds
106	# the finished binary for fossil. The BCC compiler above is used
107	# for building intermediate code-generator tools.
108	#
109	TCC = $(PREFIX)gcc -Os -Wall -L$(ZLIBDIR) -I$(ZINCDIR)
110
111	#### Compile resources for use in building executables that will run
112	# on the target platform.
113	#
114	RCC = $(PREFIX)windres -I$(SRCDIR) -I$(ZINCDIR)
115

M win/Makefile.mingw.mistachkin

+1 -1

		--- win/Makefile.mingw.mistachkin
		+++ win/Makefile.mingw.mistachkin
		@@ -104,11 +104,11 @@
104	104	# will run on the target platform. This is usually the same
105	105	# as BCC, unless you are cross-compiling. This C compiler builds
106	106	# the finished binary for fossil. The BCC compiler above is used
107	107	# for building intermediate code-generator tools.
108	108	#
109		-TCC = $(PREFIX)gcc -Os -Wall -DUNICODE -D_UNICODE -L$(ZLIBDIR) -I$(ZINCDIR)
	109	+TCC = $(PREFIX)gcc -Os -Wall -L$(ZLIBDIR) -I$(ZINCDIR)
110	110
111	111	#### Compile resources for use in building executables that will run
112	112	# on the target platform.
113	113	#
114	114	RCC = $(PREFIX)windres -I$(SRCDIR) -I$(ZINCDIR)
115	115

	--- win/Makefile.mingw.mistachkin
	+++ win/Makefile.mingw.mistachkin
	@@ -104,11 +104,11 @@
104	# will run on the target platform. This is usually the same
105	# as BCC, unless you are cross-compiling. This C compiler builds
106	# the finished binary for fossil. The BCC compiler above is used
107	# for building intermediate code-generator tools.
108	#
109	TCC = $(PREFIX)gcc -Os -Wall -DUNICODE -D_UNICODE -L$(ZLIBDIR) -I$(ZINCDIR)
110
111	#### Compile resources for use in building executables that will run
112	# on the target platform.
113	#
114	RCC = $(PREFIX)windres -I$(SRCDIR) -I$(ZINCDIR)
115

	--- win/Makefile.mingw.mistachkin
	+++ win/Makefile.mingw.mistachkin
	@@ -104,11 +104,11 @@
104	# will run on the target platform. This is usually the same
105	# as BCC, unless you are cross-compiling. This C compiler builds
106	# the finished binary for fossil. The BCC compiler above is used
107	# for building intermediate code-generator tools.
108	#
109	TCC = $(PREFIX)gcc -Os -Wall -L$(ZLIBDIR) -I$(ZINCDIR)
110
111	#### Compile resources for use in building executables that will run
112	# on the target platform.
113	#
114	RCC = $(PREFIX)windres -I$(SRCDIR) -I$(ZINCDIR)
115

M win/Makefile.msc

+1 -1

		--- win/Makefile.msc
		+++ win/Makefile.msc
		@@ -34,11 +34,11 @@
34	34
35	35	INCL = -I. -I$(SRCDIR) -I$B\win\include -I$(MSCDIR)\extra\include -I$(ZINCDIR)
36	36
37	37	CFLAGS = -nologo -MT -O2
38	38	BCC = $(CC) $(CFLAGS)
39		-TCC = $(CC) -c $(CFLAGS) -DUNICODE -D_UNICODE $(MSCDEF) $(SSL) $(INCL)
	39	+TCC = $(CC) -c $(CFLAGS) $(MSCDEF) $(SSL) $(INCL)
40	40	LIBS = $(ZLIB) ws2_32.lib advapi32.lib $(SSLLIB)
41	41	LIBDIR = -LIBPATH:$(MSCDIR)\extra\lib -LIBPATH:$(ZLIBDIR)
42	42
43	43	SQLITE_OPTIONS = /DSQLITE_OMIT_LOAD_EXTENSION=1 /DSQLITE_THREADSAFE=0 /DSQLITE_DEFAULT_FILE_FORMAT=4 /DSQLITE_ENABLE_STAT3 /Dlocaltime=fossil_localtime /DSQLITE_ENABLE_LOCKING_STYLE=0
44	44
45	45

	--- win/Makefile.msc
	+++ win/Makefile.msc
	@@ -34,11 +34,11 @@
34
35	INCL = -I. -I$(SRCDIR) -I$B\win\include -I$(MSCDIR)\extra\include -I$(ZINCDIR)
36
37	CFLAGS = -nologo -MT -O2
38	BCC = $(CC) $(CFLAGS)
39	TCC = $(CC) -c $(CFLAGS) -DUNICODE -D_UNICODE $(MSCDEF) $(SSL) $(INCL)
40	LIBS = $(ZLIB) ws2_32.lib advapi32.lib $(SSLLIB)
41	LIBDIR = -LIBPATH:$(MSCDIR)\extra\lib -LIBPATH:$(ZLIBDIR)
42
43	SQLITE_OPTIONS = /DSQLITE_OMIT_LOAD_EXTENSION=1 /DSQLITE_THREADSAFE=0 /DSQLITE_DEFAULT_FILE_FORMAT=4 /DSQLITE_ENABLE_STAT3 /Dlocaltime=fossil_localtime /DSQLITE_ENABLE_LOCKING_STYLE=0
44
45

	--- win/Makefile.msc
	+++ win/Makefile.msc
	@@ -34,11 +34,11 @@
34
35	INCL = -I. -I$(SRCDIR) -I$B\win\include -I$(MSCDIR)\extra\include -I$(ZINCDIR)
36
37	CFLAGS = -nologo -MT -O2
38	BCC = $(CC) $(CFLAGS)
39	TCC = $(CC) -c $(CFLAGS) $(MSCDEF) $(SSL) $(INCL)
40	LIBS = $(ZLIB) ws2_32.lib advapi32.lib $(SSLLIB)
41	LIBDIR = -LIBPATH:$(MSCDIR)\extra\lib -LIBPATH:$(ZLIBDIR)
42
43	SQLITE_OPTIONS = /DSQLITE_OMIT_LOAD_EXTENSION=1 /DSQLITE_THREADSAFE=0 /DSQLITE_DEFAULT_FILE_FORMAT=4 /DSQLITE_ENABLE_STAT3 /Dlocaltime=fossil_localtime /DSQLITE_ENABLE_LOCKING_STYLE=0
44
45

Fossil SCM

Keyboard Shortcuts