[git] Wincetools - branch, kdepimcetools, updated. 8e14d6599a1d1a9a21a6f4c1a7f82cc55fcae369

[by Andreas Holzammer]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "UNNAMED PROJECT".

The branch, kdepimcetools has been updated
       via  8e14d6599a1d1a9a21a6f4c1a7f82cc55fcae369 (commit)
      from  8691bd49a7c88aa8909e395aec3ba9d75f8db098 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 8e14d6599a1d1a9a21a6f4c1a7f82cc55fcae369
Author: Andreas Holzammer <andreas.holzammer at kdab.com>
Date:   Mon Jan 31 10:52:52 2011 +0100

    make the loading to the high mem optional

diff --git a/loader/CMakeLists.txt b/loader/CMakeLists.txt
index e384053..f9a166f 100644
--- a/loader/CMakeLists.txt
+++ b/loader/CMakeLists.txt
@@ -17,6 +17,7 @@ add_executable(kmail-mobile-loader WIN32 himemce.c compat.c
   kernel32_kernel_private.h kernel32_process.c kernel32_module.c
   ntdll_error.c ntdll_loader.c ntdll_virtual.c
   server_protocol.h server_mapping.c splashscreen.cpp kmail-mobile.rc)
+set_target_properties(kmail-mobile-loader PROPERTIES COMPILE_FLAGS -DUSE_LOADER)
 target_link_libraries(kmail-mobile-loader aygshell)
 install(TARGETS kmail-mobile-loader DESTINATION bin)
 
@@ -26,6 +27,7 @@ add_executable(notes-mobile-loader WIN32 himemce.c compat.c
   ntdll_error.c ntdll_loader.c ntdll_virtual.c
   server_protocol.h server_mapping.c splashscreen.cpp notes-mobile.rc)
 target_link_libraries(notes-mobile-loader aygshell)
+set_target_properties(notes-mobile-loader PROPERTIES COMPILE_FLAGS -DUSE_LOADER)
 install(TARGETS notes-mobile-loader DESTINATION bin)
 
 add_executable(kaddressbook-mobile-loader WIN32 himemce.c compat.c
@@ -34,6 +36,7 @@ add_executable(kaddressbook-mobile-loader WIN32 himemce.c compat.c
   ntdll_error.c ntdll_loader.c ntdll_virtual.c
   server_protocol.h server_mapping.c splashscreen.cpp kaddressbook-mobile.rc)
 target_link_libraries(kaddressbook-mobile-loader aygshell)
+set_target_properties(kaddressbook-mobile-loader PROPERTIES COMPILE_FLAGS -DUSE_LOADER)
 install(TARGETS kaddressbook-mobile-loader DESTINATION bin)
 
 add_executable(korganizer-mobile-loader WIN32 himemce.c compat.c
@@ -42,6 +45,7 @@ add_executable(korganizer-mobile-loader WIN32 himemce.c compat.c
   ntdll_error.c ntdll_loader.c ntdll_virtual.c
   server_protocol.h server_mapping.c splashscreen.cpp korganizer-mobile.rc)
 target_link_libraries(korganizer-mobile-loader aygshell)
+set_target_properties(korganizer-mobile-loader PROPERTIES COMPILE_FLAGS -DUSE_LOADER)
 install(TARGETS korganizer-mobile-loader DESTINATION bin)
 
 add_executable(tasks-mobile-loader WIN32 himemce.c compat.c
@@ -50,6 +54,7 @@ add_executable(tasks-mobile-loader WIN32 himemce.c compat.c
   ntdll_error.c ntdll_loader.c ntdll_virtual.c
   server_protocol.h server_mapping.c splashscreen.cpp tasks-mobile.rc)
 target_link_libraries(tasks-mobile-loader aygshell)
+set_target_properties(tasks-mobile-loader PROPERTIES COMPILE_FLAGS -DUSE_LOADER)
 install(TARGETS tasks-mobile-loader DESTINATION bin)
 
 add_executable(kleopatra-loader WIN32 himemce.c compat.c
diff --git a/loader/himemce.c b/loader/himemce.c
index ba388b9..1622ed1 100644
--- a/loader/himemce.c
+++ b/loader/himemce.c
@@ -63,6 +63,7 @@ main (int argc, char *argv[])
   WCHAR *cmdline;
 
   BOOL ret;
+  int result = 0;
 
   SetCursor( LoadCursor( NULL, IDC_WAIT ) );
   app_name = get_app_name ();
@@ -73,12 +74,16 @@ main (int argc, char *argv[])
   /* Note that this does not spawn a new process, but just calls into
      the startup function of the app eventually, and returns with its
      exit code.  */
+#if USE_LOADER
+  ret = MyCreateProcessW (app_name, cmdline, &result);
+#else
   ret = CreateProcess (app_name, cmdline, NULL, NULL, FALSE, CREATE_NEW_CONSOLE, NULL, NULL, NULL, NULL);
+#endif
   if (! ret)
     {
       ERR ("starting %S failed: %i\n", app_name, GetLastError());
       return 1;
     }
 
-  return 0;
+  return result;
 }

-----------------------------------------------------------------------

Summary of changes:
 loader/CMakeLists.txt |    5 +++++
 loader/himemce.c      |    7 ++++++-
 2 files changed, 11 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
UNNAMED PROJECT
http://git.gnupg.org