Ticket #6597: 6597-backend-win32.2.patch

libs/libmyth/mythcontext.cpp

@@ -1547 +1547 @@
 {
 #if defined(CONFIG_DARWIN) || (__FreeBSD__) || defined(__OpenBSD__)
     const char *command = "ps -ax | grep -i mythbackend | grep -v grep > /dev/null";
+#elif defined USING_MINGW
+    const char *command = "%systemroot%\\system32\\tasklist.exe "
+       " | %systemroot%\\system32\\find.exe /i \"mythbackend.exe\" ";
 #else
     const char *command = "ps -ae | grep mythbackend > /dev/null";
 #endif

libs/libmyth/util.cpp

@@ -1118 +1118 @@
     if (GetTempFileNameA(temppath, "mth", 0, tempfilename))
     {
         if (dir)
+        {
+            // GetTempFileNameA creates the file, so delete it before mkdir
+            unlink(tempfilename);
             ret = mkdir(tempfilename);
+        }
         else
             ret = open(tempfilename, O_CREAT | O_RDWR, S_IREAD | S_IWRITE);
     }

libs/libmythui/mythsystem.cpp

@@ -178 +178 @@
             VERBOSE(VB_IMPORTANT,
                     (LOC_ERR + "WaitForSingleObject() failed because %1")
                     .arg(::GetLastError()));
+        DWORD exitcode = GENERIC_EXIT_OK;
+        if (!GetExitCodeProcess(pi.hProcess, &exitcode))
+            VERBOSE(VB_IMPORTANT, (LOC_ERR + 
+                    "GetExitCodeProcess() failed because %1")
+                    .arg(::GetLastError()));
         CloseHandle(pi.hProcess);
         CloseHandle(pi.hThread);
-        return GENERIC_EXIT_OK;
+        // VERBOSE(VB_IMPORTANT, cmd + QString(" returned %1").arg(exitcode));
+        return exitcode;
     }
 #endif
     return GENERIC_EXIT_NOT_OK;

libs/libmythtv/ThreadedFileWriter.cpp

@@ -161 +161 @@
     }
     else
     {
+#ifdef USING_MINGW
+        _setmode(fd, _O_BINARY);
+#endif
         buf = new char[TFW_DEF_BUF_SIZE + 1024];
         bzero(buf, TFW_DEF_BUF_SIZE + 64);
 

libs/libmythdb/mythsocket.cpp

@@ -42 +42 @@
 {
     VERBOSE(VB_SOCKET, LOC + "new socket");
     if (socket > -1)
+    {
         setSocket(socket);
+#ifdef USING_MINGW
+        // Windows sockets' default buffersize is too small for streaming
+        // Could this apply to other platforms, too?
+        setSendBufferSize(kSocketBufferSize);
+        // VERBOSE(VB_SOCKET, QString("rcvbuf = %1, sndbuf=%2")
+        //         .arg(receiveBufferSize()).arg(sendBufferSize()));
+#endif  
+    }
 
     if (m_cb)
         m_readyread_thread.AddToReadyRead(this);