From 06d154700cdabfa1e37320533f8799a733a44530 Mon Sep 17 00:00:00 2001
From: Son Hyunjun <hj79.son@samsung.com>
Date: Wed, 14 Mar 2012 22:41:34 +0900
Subject: [PATCH] add winsock startup,cleanup

---
 qemu-sockets.c                   |  2 ++
 tizen/src/emulator.c             | 15 +++++++++++++++
 tizen/src/guest_server.c         |  4 ++++
 tizen/src/skin/maruskin_server.c |  8 --------
 4 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/qemu-sockets.c b/qemu-sockets.c
index 61b2247..12d35dc 100644
--- a/qemu-sockets.c
+++ b/qemu-sockets.c
@@ -665,6 +665,7 @@ static void socket_cleanup(void)
 int socket_init(void)
 {
 #ifdef _WIN32
+#ifndef CONFIG_MARU
     WSADATA Data;
     int ret, err;
 
@@ -676,5 +677,6 @@ int socket_init(void)
     }
     atexit(socket_cleanup);
 #endif
+#endif
     return 0;
 }
diff --git a/tizen/src/emulator.c b/tizen/src/emulator.c
index 95852a3..1e3a250 100644
--- a/tizen/src/emulator.c
+++ b/tizen/src/emulator.c
@@ -41,6 +41,9 @@
 #include "guest_server.h"
 #include "debug_ch.h"
 #include "process.h"
+#ifdef _WIN32
+#include <winsock2.h>
+#endif
 
 MULTI_DEBUG_CHANNEL(qemu, main);
 
@@ -140,6 +143,14 @@ int qemu_main(int argc, char** argv, char** envp);
 
 int main(int argc, char* argv[])
 {
+#ifdef _WIN32
+    WSADATA wsadata;
+    if(WSAStartup(MAKEWORD(2,0), &wsadata) == SOCKET_ERROR) {
+        ERR("Error creating socket.\n");
+        return NULL;
+    }
+#endif
+
     tizen_base_port = get_sdb_base_port();
 
     int skin_argc = 0;
@@ -185,6 +196,10 @@ int main(int argc, char* argv[])
 
     exit_emulator();
 
+#ifdef _WIN32
+    WSACleanup();
+#endif
+
     return 0;
 }
 
diff --git a/tizen/src/guest_server.c b/tizen/src/guest_server.c
index a7d8763..1101ca5 100644
--- a/tizen/src/guest_server.c
+++ b/tizen/src/guest_server.c
@@ -63,6 +63,8 @@ pthread_t start_guest_server( int server_port ) {
 
     if ( 0 != pthread_create( &thread_id, NULL, run_guest_server, NULL ) ) {
         ERR( "fail to create guest_server pthread.\n" );
+    }else {
+        INFO( "created guest server thread\n" );
     }
 
     return thread_id;
@@ -71,6 +73,8 @@ pthread_t start_guest_server( int server_port ) {
 
 static void* run_guest_server( void* args ) {
 
+    INFO( "start guest server thread.\n" );
+
     uint16_t port;
     struct sockaddr_in server_addr, client_addr;
     socklen_t client_len;
diff --git a/tizen/src/skin/maruskin_server.c b/tizen/src/skin/maruskin_server.c
index f8a68b5..89df27f 100644
--- a/tizen/src/skin/maruskin_server.c
+++ b/tizen/src/skin/maruskin_server.c
@@ -153,14 +153,6 @@ static void* run_skin_server( void* args ) {
     struct sockaddr_in server_addr, client_addr;
     socklen_t client_len;
 
-#ifdef __MINGW32__
-    WSADATA wsadata;
-    if(WSAStartup(MAKEWORD(2,0), &wsadata) == SOCKET_ERROR) {
-        ERR("Error creating socket.\n");
-        return NULL;
-    }
-#endif
-
     port = svr_port;
 
     if ( ( server_sock = socket( PF_INET, SOCK_STREAM, IPPROTO_TCP ) ) < 0 ) {
-- 
2.7.4