[Spice-commits] 2 commits - Makefile.am vdagent/vdagent.cpp vdservice/vdservice.cpp

[Christophe Fergau]

 Makefile.am             |    1 -
 vdagent/vdagent.cpp     |    2 +-
 vdservice/vdservice.cpp |    6 +++---
 3 files changed, 4 insertions(+), 5 deletions(-)

New commits:
commit 74af857e8e4a6240e9aac4a3d72aa0e5a443472b
Author: Christophe Fergeau <cfergeau at redhat.com>
Date:   Thu Mar 1 16:58:18 2012 +0100

    Revert "mingw: remove tMain use"
    
    This patch wasn't sent for review, and wasn't meant to be pushed
    as part of the mingw series
    
    This reverts commit 63541ea6ac722d332966f28e1779e4d668244fcb.

diff --git a/vdagent/vdagent.cpp b/vdagent/vdagent.cpp
index 5ef0a18..5cbe222 100644
--- a/vdagent/vdagent.cpp
+++ b/vdagent/vdagent.cpp
@@ -1355,7 +1355,7 @@ LRESULT CALLBACK VDAgent::wnd_proc(HWND hwnd, UINT message, WPARAM wparam, LPARA
     return 0;
 }
 
-int main(int argc,char **argv)
+int APIENTRY _tWinMain(HINSTANCE instance, HINSTANCE prev_instance, LPTSTR cmd_line, int cmd_show)
 {
     VDAgent* vdagent = VDAgent::get();
     vdagent->run();
diff --git a/vdservice/vdservice.cpp b/vdservice/vdservice.cpp
index 9c057bb..4701f5a 100644
--- a/vdservice/vdservice.cpp
+++ b/vdservice/vdservice.cpp
@@ -1216,7 +1216,7 @@ void VDService::write_agent_control(uint32_t type, uint32_t opaque)
     }
 }
 
-int main(int argc, char* argv[], char* envp[])
+int _tmain(int argc, TCHAR* argv[], TCHAR* envp[])
 {
     bool success = false;
 
@@ -1226,9 +1226,9 @@ int main(int argc, char* argv[], char* envp[])
     }
     VDService* vdservice = VDService::get();
     if (argc > 1) {
-        if (strcmp(argv[1], "install") == 0) {
+        if (lstrcmpi(argv[1], TEXT("install")) == 0) {
             success = vdservice->install();
-        } else if (strcmp(argv[1], "uninstall") == 0) {
+        } else if (lstrcmpi(argv[1], TEXT("uninstall")) == 0) {
             success = vdservice->uninstall();
         } else {
             printf("Use: vdservice install / uninstall\n");
commit dec8f9d049b884db2bf91c40478c832b4a4628fc
Author: Christophe Fergeau <cfergeau at redhat.com>
Date:   Thu Mar 1 16:57:36 2012 +0100

    Revert "mingw: make sure unicode support is enabled"
    
    This patch wasn't sent for review, and wasn't meant to be pushed
    as part of the mingw series
    
    This reverts commit 04e53efb312cdb1244b11e10f621fe8569c468f2.

diff --git a/Makefile.am b/Makefile.am
index 2e845ec..cf514f1 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,7 +1,6 @@
 INCLUDES =				\
 	-I$(top_srcdir)/common		\
 	$(SPICE_PROTOCOL_CFLAGS)
-AM_CPPFLAGS=-DUNICODE -D_UNICODE
 
 bin_PROGRAMS = vdagent vdservice