updater: move the windows process starting code to comphelper

Change-Id: I1a499f57d01ee28afdb2c4f85dc976f2e6837dfd
Reviewed-on: https://gerrit.libreoffice.org/40837
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>

comphelper/Module_comphelper.mk

@@ -21,6 +21,8 @@ $(eval $(call gb_Module_Module,comphelper))
 
 $(eval $(call gb_Module_add_targets,comphelper,\
     Library_comphelper \
+	$(if $(filter WNT,$(OS)),\
+		StaticLibrary_windows_process )\
 ))
 
 $(eval $(call gb_Module_add_subsequentcheck_targets,comphelper,\

comphelper/StaticLibrary_windows_process.mk

@@ -7,16 +7,18 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_StaticLibrary_StaticLibrary,winhelper))
+$(eval $(call gb_StaticLibrary_StaticLibrary,windows_process))
 
-$(eval $(call gb_StaticLibrary_set_include,winhelper,\
-	-I$(SRCDIR)/onlineupdate/inc/ \
-	-I$(SRCDIR)/onlineupdate/source/winhelper/ \
+$(eval $(call gb_StaticLibrary_set_include,windows_process,\
 	$$(INCLUDE) \
 ))
 
-$(eval $(call gb_StaticLibrary_add_exception_objects,winhelper,\
-	onlineupdate/source/winhelper/windowsStart \
+$(eval $(call gb_StaticLibrary_add_defs,windows_process,\
+	-DUNICODE \
+))
+
+$(eval $(call gb_StaticLibrary_add_exception_objects,windows_process,\
+	comphelper/source/windows/windows_process \
 ))
 
 # vim:set shiftwidth=4 tabstop=4 noexpandtab: */

include/comphelper/windowsStart.hxx

@@ -3,8 +3,8 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#ifndef INCLUDED_ONLINEUPDATE_INC_WINSTART_HXX
-#define INCLUDED_ONLINEUPDATE_INC_WINSTART_HXX
+#ifndef INCLUDED_COMPHELPER_WINSTART_HXX
+#define INCLUDED_COMPHELPER_WINSTART_HXX
 
 #ifdef _WIN32
 #include <windows.h>

onlineupdate/Executable_updater.mk

@@ -23,7 +23,7 @@ $(eval $(call gb_Executable_use_static_libraries,updater,\
     libmarverify \
     updatehelper \
 	$(if $(filter WNT,$(OS)), \
-		winhelper )\
+		windows_process )\
 ))
 
 $(eval $(call gb_Executable_use_externals,updater,\

onlineupdate/Module_onlineupdate.mk

@@ -17,8 +17,7 @@ $(eval $(call gb_Module_add_targets,onlineupdate,\
 	StaticLibrary_updatehelper \
 	$(if $(filter WNT,$(OS)),\
 		Executable_update_service \
-		WinResTarget_updater \
-		StaticLibrary_winhelper )\
+		WinResTarget_updater )\
 	Executable_mar \
 	Executable_updater \
 	Executable_mbsdiff \

onlineupdate/source/update/updater/updater.cxx

@@ -63,7 +63,7 @@
 #include <onlineupdate/mozilla/Types.h>
 
 #ifdef _WIN32
-#include <winhelper/windowsStart.hxx>
+#include <comphelper/windowsStart.hxx>
 #include "uachelper.h"
 #include "pathhash.h"