[Openh323-cvs] pwlib/src/ptlib/msos svcproc.cxx, 1.89, 1.90 vidinput_directx.cxx, 1.1, 1.2 wincfg.cxx, 1.19, 1.20 winsock.cxx, 1.74, 1.75

[Damien S. <dsa...@us...>]

Update of /cvsroot/openh323/pwlib/src/ptlib/msos
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv21331/src/ptlib/msos

Modified Files:
	svcproc.cxx vidinput_directx.cxx wincfg.cxx winsock.cxx 
Log Message:
Killed GCC 4.2 warnings.


Index: winsock.cxx
===================================================================
RCS file: /cvsroot/openh323/pwlib/src/ptlib/msos/winsock.cxx,v
retrieving revision 1.74
retrieving revision 1.75
diff -C2 -d -r1.74 -r1.75
*** winsock.cxx	3 Oct 2006 06:28:26 -0000	1.74
--- winsock.cxx	30 Sep 2007 17:34:40 -0000	1.75
***************
*** 28,31 ****
--- 28,34 ----
   *
   * $Log$
+  * Revision 1.75  2007/09/30 17:34:40  dsandras
+  * Killed GCC 4.2 warnings.
+  *
   * Revision 1.74  2006/10/03 06:28:26  csoutheren
   * Ensure ios bits are reset when a PChannel is closed
***************
*** 283,287 ****
--- 286,294 ----
  #define IPX_PTYPE 0x4000
  #define NS_DEFAULT 0
+ 
+ #ifndef SVCID_NETWARE
  #define SVCID_NETWARE(_SapId) {(0x000B << 16)|(_SapId),0,0,{0xC0,0,0,0,0,0,0,0x46}}
+ #endif /* SVCID_NETWARE */
+ 
  #define SVCID_FILE_SERVER SVCID_NETWARE(0x4)
  #endif

Index: svcproc.cxx
===================================================================
RCS file: /cvsroot/openh323/pwlib/src/ptlib/msos/svcproc.cxx,v
retrieving revision 1.89
retrieving revision 1.90
diff -C2 -d -r1.89 -r1.90
*** svcproc.cxx	20 Sep 2007 05:43:25 -0000	1.89
--- svcproc.cxx	30 Sep 2007 17:34:40 -0000	1.90
***************
*** 28,31 ****
--- 28,34 ----
   *
   * $Log$
+  * Revision 1.90  2007/09/30 17:34:40  dsandras
+  * Killed GCC 4.2 warnings.
+  *
   * Revision 1.89  2007/09/20 05:43:25  rjongbloed
   * Added ability to log output to debugger.
***************
*** 731,735 ****
    if (!debugMode && !isWin95) {
      static SERVICE_TABLE_ENTRY dispatchTable[] = {
!       { "", PServiceProcess::StaticMainEntry },
        { NULL, NULL }
      };
--- 734,738 ----
    if (!debugMode && !isWin95) {
      static SERVICE_TABLE_ENTRY dispatchTable[] = {
!       { (char*) "", PServiceProcess::StaticMainEntry },
        { NULL, NULL }
      };
***************
*** 1316,1320 ****
    // register our service control handler:
    statusHandle = RegisterServiceCtrlHandler(GetName(), StaticControlEntry);
!   if (statusHandle == NULL)
      return;
  
--- 1319,1323 ----
    // register our service control handler:
    statusHandle = RegisterServiceCtrlHandler(GetName(), StaticControlEntry);
!   if (statusHandle == FALSE)
      return;
  

Index: vidinput_directx.cxx
===================================================================
RCS file: /cvsroot/openh323/pwlib/src/ptlib/msos/vidinput_directx.cxx,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** vidinput_directx.cxx	9 Jun 2007 17:21:42 -0000	1.1
--- vidinput_directx.cxx	30 Sep 2007 17:34:40 -0000	1.2
***************
*** 1318,1336 ****
      GUID  media_format;
  };
  static struct pwlib_fmt formats[] =
  {
!     {"Grey",    MEDIASUBTYPE_RGB8 },
!     {"BGR32",   MEDIASUBTYPE_RGB32}, /* Microsoft assumes that we are in little endian */
!     {"BGR24",   MEDIASUBTYPE_RGB24},
!     {"RGB565",  MEDIASUBTYPE_RGB565},
!     {"RGB555",  MEDIASUBTYPE_RGB555},
!     {"YUV420P", MEDIASUBTYPE_I420},
!     {"YUV422P", MEDIASUBTYPE_YUYV},
!     {"YUV411",  MEDIASUBTYPE_Y411},
!     {"YUV411P", MEDIASUBTYPE_Y41P},
!     {"YUV410P", MEDIASUBTYPE_YVU9},
!     {"YUY2",    MEDIASUBTYPE_YUY2},
!     {"MJPEG",   MEDIASUBTYPE_MJPG},
!     {"UYVY422", MEDIASUBTYPE_UYVY},
  };
  
--- 1318,1337 ----
      GUID  media_format;
  };
+ 
  static struct pwlib_fmt formats[] =
  {
!     {(char*) "Grey",    MEDIASUBTYPE_RGB8 },
!     {(char*) "BGR32",   MEDIASUBTYPE_RGB32}, /* Microsoft assumes that we are in little endian */
!     {(char*) "BGR24",   MEDIASUBTYPE_RGB24},
!     {(char*) "RGB565",  MEDIASUBTYPE_RGB565},
!     {(char*) "RGB555",  MEDIASUBTYPE_RGB555},
!     {(char*) "YUV420P", MEDIASUBTYPE_I420},
!     {(char*) "YUV422P", MEDIASUBTYPE_YUYV},
!     {(char*) "YUV411",  MEDIASUBTYPE_Y411},
!     {(char*) "YUV411P", MEDIASUBTYPE_Y41P},
!     {(char*) "YUV410P", MEDIASUBTYPE_YVU9},
!     {(char*) "YUY2",    MEDIASUBTYPE_YUY2},
!     {(char*) "MJPEG",   MEDIASUBTYPE_MJPG},
!     {(char*) "UYVY422", MEDIASUBTYPE_UYVY},
  };
  

Index: wincfg.cxx
===================================================================
RCS file: /cvsroot/openh323/pwlib/src/ptlib/msos/wincfg.cxx,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** wincfg.cxx	17 Sep 2007 04:15:40 -0000	1.19
--- wincfg.cxx	30 Sep 2007 17:34:40 -0000	1.20
***************
*** 28,31 ****
--- 28,34 ----
   *
   * $Log$
+  * Revision 1.20  2007/09/30 17:34:40  dsandras
+  * Killed GCC 4.2 warnings.
+  *
   * Revision 1.19  2007/09/17 04:15:40  rjongbloed
   * Tidy up of some traces.
***************
*** 252,256 ****
    DWORD disposition;
  
!   return RegCreateKeyEx(rootKey, subkey, 0, "", REG_OPTION_NON_VOLATILE,
                          KEY_ALL_ACCESS, &secattr, &key, &disposition);
  }
--- 255,259 ----
    DWORD disposition;
  
!   return RegCreateKeyEx(rootKey, subkey, 0, (char*) "", REG_OPTION_NON_VOLATILE,
                          KEY_ALL_ACCESS, &secattr, &key, &disposition);
  }
***************
*** 331,335 ****
  
      DWORD disposition;
!     error = RegCreateKeyEx(basekey, subkey, 0, "", REG_OPTION_NON_VOLATILE,
                             KEY_ALL_ACCESS, NULL, &key, &disposition);
      if (error != ERROR_SUCCESS) {
--- 334,338 ----
  
      DWORD disposition;
!     error = RegCreateKeyEx(basekey, subkey, 0, (char*) "", REG_OPTION_NON_VOLATILE,
                             KEY_ALL_ACCESS, NULL, &key, &disposition);
      if (error != ERROR_SUCCESS) {