Changeset 21730 for branches/gcc-kmk/src

Timestamp:

Oct 21, 2011, 4:52:51 PM (14 years ago)

Author:

dmik

Message:

Common compiler warnings and errors.

Location:

branches/gcc-kmk/src/kernel32

Files:

• HandleManager.cpp (modified) (2 diffs)
• conprop.cpp (modified) (4 diffs)
• environ.cpp (modified) (7 diffs)
• hmcomm.cpp (modified) (3 diffs)
• wprocess.cpp (modified) (2 diffs)

branches/gcc-kmk/src/kernel32/HandleManager.cpp

@@ -454 +454 @@
  *****************************************************************************/
 
-static ULONG INLINE _HMHandleQuery(HANDLE hHandle)
+INLINE ULONG _HMHandleQuery(HANDLE hHandle)
 {
     if (hHandle >= MAX_OS2_HMHANDLES)        /* check the table range */
@@ -2133 +2133 @@
  *           GetFileSizeEx   (KERNEL32.@)
  */
-#define INVALID_FILE_SIZE        ((DWORD)~0UL)
 BOOL WINAPI GetFileSizeEx( HANDLE hFile, PLARGE_INTEGER lpFileSize )
 {

branches/gcc-kmk/src/kernel32/conprop.cpp

@@ -70 +70 @@
   ULONG     ulID;                  // Resource ID for dialog page
   PFNWP     wpDlgProc;             // dialog window procedure
-  PSZ       szStatusLineText;      // Text to go on status line
-  PSZ       szTabText;             // Text to go on major tab
+  PCSZ      szStatusLineText;      // Text to go on status line
+  PCSZ      szTabText;             // Text to go on major tab
   ULONG     idFocus;               // ID of the control to get the focus first
   BOOL      fParent;               // Is this a Parent page with minor pages
@@ -92 +92 @@
 /**********************************************************************/
 
-static VOID ErrorMsg( PSZ szFormat,
-                     ... );
+static VOID ErrorMsg(PCSZ szFormat,
+                     ...);
 
 
@@ -195 +195 @@
 };
 
-static PSZ priorities[] = {"idle", "normal", "critical", "server"};
+static PCSZ priorities[] = {"idle", "normal", "critical", "server"};
 #define NUMPRIORITIES 4
 
@@ -216 +216 @@
 #define MESSAGE_SIZE 1024
 
-static VOID ErrorMsg( PSZ szFormat,
-                     ... )
+static VOID ErrorMsg(PCSZ szFormat,
+                     ...)
 {
   PSZ     szMsg;

branches/gcc-kmk/src/kernel32/environ.cpp

@@ -41 +41 @@
 //list of important OS/2 environment variables that must not be removed
 //when creating a new process
-static char *lpReservedEnvStrings[] = {
+static const char *lpReservedEnvStrings[] = {
 "HOSTNAME",
 "TZ",
@@ -76 +76 @@
   //TEMP is a standard environment variable in Windows, but is not always
   //present in OS/2, so make sure it is.
-  if(GetEnvironmentVariableA("TEMP", szVar, sizeof(szVar)) == 0) 
+  if(GetEnvironmentVariableA("TEMP", szVar, sizeof(szVar)) == 0)
   {
       if(GetEnvironmentVariableA("TMP", szVar, sizeof(szVar)) == 0) {
@@ -226 +226 @@
  *             If the function fails, the return value is zero
  * Remark    :
- * Status    : 
+ * Status    :
  *
  *****************************************************************************/
@@ -254 +254 @@
             if ((p = strchr( src + 1, '%' )) != NULL)
             {
-                len = p - src - 1;  /* Length of the variable name */   
+                len = p - src - 1;  /* Length of the variable name */
                 if ((var = ENV_FindVariable( GetEnvironmentStringsA(),
                                              src + 1, len )) != NULL)
@@ -309 +309 @@
  *             If the function fails, the return value is zero
  * Remark    :
- * Status    : 
+ * Status    :
  *
  *****************************************************************************/
@@ -340 +340 @@
     char *tmpenvnew, *newenv;
     int newsize = 0, len;
-        
+
     dprintf(("New environment:"));
     while(*tmpenvold) {
@@ -374 +374 @@
         tmpenvold += len+1;
     }
+    int i;
     for(i=0;i<sizeof(lpReservedEnvStrings)/sizeof(char *);i++) {
         if(!ENV_FindVariable(lpEnvironment, lpReservedEnvStrings[i], strlen(lpReservedEnvStrings[i]))) {

branches/gcc-kmk/src/kernel32/hmcomm.cpp

@@ -233 +233 @@
         {
             OSLibDosClose(pHMHandleData->hHMHandle);
-            delete pHMHandleData->lpHandlerData;
+            delete (PHMDEVCOMDATA)pHMHandleData->lpHandlerData;
             return rc;
         }
@@ -274 +274 @@
 fail:
 
-    delete pHMHandleData->lpHandlerData;
+    delete (PHMDEVCOMDATA)pHMHandleData->lpHandlerData;
     OSLibDosClose(pHMHandleData->hHMHandle);
     return ret;
@@ -300 +300 @@
 BOOL HMDeviceCommClass::CloseHandle(PHMHANDLEDATA pHMHandleData)
 {
-    PHMDEVCOMDATA pDevData = (PHMDEVCOMDATA)pHMHandleData->lpHandlerData;
     dprintf(("HMComm: Serial communication port close request"));
 
-    delete pHMHandleData->lpHandlerData;
+    delete (PHMDEVCOMDATA)pHMHandleData->lpHandlerData;
     return OSLibDosClose(pHMHandleData->hHMHandle);
 }

branches/gcc-kmk/src/kernel32/wprocess.cpp

@@ -299 +299 @@
     StartupInfo.cbReserved2     = NULL;
     if (!StartupInfo.lpDesktop)
-        StartupInfo.lpDesktop  = "Desktop";
+        StartupInfo.lpDesktop  = (LPSTR)"Desktop";
     if (!StartupInfo.lpTitle)
-        StartupInfo.lpTitle    = "Title";
+        StartupInfo.lpTitle    = (LPSTR)"Title";
     ProcessENVDB.hStdin  = StartupInfo.hStdInput  = GetStdHandle(STD_INPUT_HANDLE);
     ProcessENVDB.hStdout = StartupInfo.hStdOutput = GetStdHandle(STD_OUTPUT_HANDLE);
@@ -2987 +2987 @@
 
     lpmodinfo->SizeOfImage = winmod->getImageSize();
-    lpmodinfo->EntryPoint  = winmod->getEntryPoint();
+    lpmodinfo->EntryPoint  = (LPVOID)winmod->getEntryPoint();
     lpmodinfo->lpBaseOfDll = (void*)hModule;