Changeset 360

Timestamp:

Jun 18, 2009, 8:55:46 PM (16 years ago)

Author:

RBRi

Message:

warning fixes

Location:

trunk/hlpmgr

Files:

• globalfilelist.h (modified) (2 diffs)
• helpinstance.c (modified) (13 diffs)
• misc.c (modified) (5 diffs)
• sharedmemory.c (modified) (10 diffs)
• sharedmemory.h (modified) (4 diffs)
• utility.c (modified) (6 diffs)
• utility.h (modified) (2 diffs)

trunk/hlpmgr/globalfilelist.h

@@ -13 +13 @@
 typedef TOpenFileEntry* TPOpenFileEntry;
 
-typedef struct 
+typedef struct
 {
   TSubAllocatedSharedMemory FMem;
@@ -24 +24 @@
 void CloseGlobalFilelist( TGlobalFilelist* pList );
 
-HWND FindFileInGlobalFilelist( TGlobalFilelist* pList,
-                               char* FilePath );
+HWND FindFileInGlobalFilelist( TGlobalFilelist* pList, char* FilePath );
 
 #endif
+

trunk/hlpmgr/helpinstance.c

@@ -17 +17 @@
   if ( ! pHelpInstance -> FViewerStarted )
   {
-    // get focus frame 
+    // get focus frame
     FocusFrame = GetTopLevelWindow( WinQueryFocus( HWND_DESKTOP ) );
     // associate viewer with that.
@@ -77 +77 @@
                    mp2 );
   if ( ok )
-    LogEvent( "  Posted OK" ); 
+    LogEvent( "  Posted OK" );
   else
     LogEvent( "  WinPostMsg failed" );
@@ -86 +86 @@
 //--------------------------------------------------------------------------------
 void PostQueuedViewerMessages( TPHelpInstance pHelpInstance )
-{  
+{
   int i;
   TQueuedViewerMessage ViewerMessage;
@@ -119 +119 @@
 //--------------------------------------------------------------------------------
 
-// Add the given window to the list of associated 
+// Add the given window to the list of associated
 // windows for this help instance
 //--------------------------------------------------------------------------------
@@ -129 +129 @@
             pHelpInstance );
 
-  if ( IsWindowAssociated( pHelpInstance, hwnd ) ) 
-  { 
+  if ( IsWindowAssociated( pHelpInstance, hwnd ) )
+  {
     LogEvent( "Already associated" );
     return;
@@ -151 +151 @@
 
   // see if it will fit.
-  if (    pHelpInstance -> FNumApplicationWindows 
+  if (    pHelpInstance -> FNumApplicationWindows
        >= pHelpInstance -> FMaxApplicationWindows )
   {
@@ -160 +160 @@
     else
       // double space
-      pHelpInstance -> FMaxApplicationWindows *= 2; 
+      pHelpInstance -> FMaxApplicationWindows *= 2;
 
     LogEvent( "AssociateWIndow: allocating list space to %d",
@@ -166 +166 @@
 
     // reallocate memory.
-    pHelpInstance -> FApplicationWindows 
-      = (HWND*) realloc( pHelpInstance -> FApplicationWindows, 
-                         pHelpInstance -> FMaxApplicationWindows 
+    pHelpInstance -> FApplicationWindows
+      = (HWND*) realloc( pHelpInstance -> FApplicationWindows,
+                         pHelpInstance -> FMaxApplicationWindows
                          * sizeof( HWND ) );
   }
-  
+
   pHelpInstance ->
     FApplicationWindows[ pHelpInstance -> FNumApplicationWindows ]
@@ -180 +180 @@
   LogEvent( "AssociateWindow: Now have %d windows associated",
             pHelpInstance -> FNumApplicationWindows );
-}  
-
-// Removes the given window from the list of associated 
+}
+
+// Removes the given window from the list of associated
 // windows for this help instance (if present)
 //--------------------------------------------------------------------------------
@@ -199 +199 @@
       j = i;
       while( j < pHelpInstance -> FNumApplicationWindows - 1 )
-      { 
+      {
         pHelpInstance -> FApplicationWindows[ j ]
           = pHelpInstance -> FApplicationWindows[ j + 1 ];
@@ -245 +245 @@
   ulMagicNumber = WinQueryWindowULong( hwnd, QWL_HELPINSTANCEMAGICNUMBER );
 
-  if ( ulMagicNumber != HELPINSTANCEMAGICNUMBER ) 
+  if ( ulMagicNumber != HELPINSTANCEMAGICNUMBER )
     return NULL;
 
@@ -263 +263 @@
     // free copy of resource
     FreeHelpTable( & ( pHelpInstance -> pHelpTable ) );
-}   
+}
 
 //--------------------------------------------------------------------------------
@@ -276 +276 @@
   pHelpInstance -> FNumApplicationWindows = 0;
   pHelpInstance -> FMaxApplicationWindows = 0;
-  pHelpInstance -> FApplicationWindows = NULL; 
-    
-  pHelpInstance -> FActiveWindow = NULLHANDLE; 
+  pHelpInstance -> FApplicationWindows = NULL;
+
+  pHelpInstance -> FActiveWindow = NULLHANDLE;
 
   return pHelpInstance;
 }
-
+

trunk/hlpmgr/misc.c

@@ -5 +5 @@
 #include "misc.h"
 
-USHORT APIENTRY NHMSearchMIndex( PVOID pInstance, 
-                                 HWND hwnd, 
+USHORT APIENTRY NHMSearchMIndex( PVOID pInstance,
+                                 HWND hwnd,
                                  PSZ pchText )
 {
@@ -13 +13 @@
 }
 
-// e.g.   p = DBMstrtok2(EnvStr, "; \0");    
+// e.g.   p = DBMstrtok2(EnvStr, "; \0");
 // probably just use strtok unless you really want to support dbcs
 PCH APIENTRY NHMDBMstrtok2( PCH s1, PCH s2 )
@@ -28 +28 @@
 }
 
-// e.g. 
-// pCountry = (PVOID)WinSendMsg ( _hwndMIndexInstance, 
-//                                HM_QPSTRUCT,  
-//                                MPFROMSHORT(STRUCT_COUNTRY_INFO), 
+// e.g.
+// pCountry = (PVOID)WinSendMsg ( _hwndMIndexInstance,
+//                                HM_QPSTRUCT,
+//                                MPFROMSHORT(STRUCT_COUNTRY_INFO),
 //                                NULL );
 // if ( MscStriCmp( TabText.pString, szBuf1, pCountry ) )
@@ -44 +44 @@
 
 // Attempt to see if we can get OpenChat running (not with help tho)
-BOOL APIENTRY NHM32SetHelpDatabase(PINSTANCE pInstance, PSZ DatabaseName, USHORT usObtimizeType) 
+BOOL APIENTRY NHM32SetHelpDatabase(PINSTANCE pInstance, PSZ DatabaseName, USHORT usObtimizeType)
 {
   // Jolly good, whatever you say...
@@ -71 +71 @@
   return TRUE;
 }
-
+

trunk/hlpmgr/sharedmemory.c

@@ -17 +17 @@
   char FullName[ 260 ];
 
-  pSharedMemory -> FFirst = TRUE;  
+  pSharedMemory -> FFirst = TRUE;
 
   strcpy( FullName, "\\SHAREMEM\\" );
@@ -31 +31 @@
   {
     LogEvent( "  Unable to create shared mem: %d", rc );
-    if ( rc == ERROR_ALREADY_EXISTS ) 
+    if ( rc == ERROR_ALREADY_EXISTS )
     {
       LogEvent( "  - Already exists, open" );
@@ -55 +55 @@
   while( TRUE )
   {
-    rc = DosOpenMutexSem( pszName, 
-                          phmtx ); 
+    rc = DosOpenMutexSem( pszName,
+                          phmtx );
 
     if ( rc != ERROR_SEM_NOT_FOUND )
@@ -62 +62 @@
       break;
 
-    rc = DosCreateMutexSem( pszName, 
+    rc = DosCreateMutexSem( pszName,
                             phmtx,
-                            0, 
-                            FALSE ); 
+                            0,
+                            FALSE );
     if ( rc != ERROR_DUPLICATE_NAME )
       // ok, or some error
@@ -91 +91 @@
                                     ULONG Size,
                                     ULONG ReserveSize, // size to reserve at start of memory
-                                    TSubAllocatedSharedMemory* pSharedMemory ) 
+                                    TSubAllocatedSharedMemory* pSharedMemory )
 {
   APIRET rc;
@@ -113 +113 @@
   LogEvent( "  semaphore name: %s", SemaphoreName );
 
-  rc = OpenOrCreateMutex( SemaphoreName, 
+  rc = OpenOrCreateMutex( SemaphoreName,
                           & StartupSemaphore );
   if ( rc != 0 )
@@ -151 +151 @@
   }
 
-  pSharedMemory -> FAllocationArea = 
+  pSharedMemory -> FAllocationArea =
     (PBYTE) pSharedMemory -> FMem.FPointer
     + ActualReserveSize;
@@ -207 +207 @@
                     void** p )
 {
-  APIRET rc;  
+  APIRET rc;
   PULONG pSize;
   ULONG Size;
@@ -221 +221 @@
 
   *p = NULL;
-}    
+}
 
 void ReleaseSubAllocatedSharedMemory( TSubAllocatedSharedMemory* pSharedMemory )
@@ -232 +232 @@
   ReleaseSharedMemory( & pSharedMemory -> FMem );
 }
-
+

trunk/hlpmgr/sharedmemory.h

@@ -7 +7 @@
 // in the memory.
 
-typedef struct 
+typedef struct
 {
   void* FPointer;
@@ -25 +25 @@
 // Otherwise the Data property should not be used.
 
-typedef struct 
+typedef struct
 {
   TSharedMemory FMem;
-  void* FAllocationArea;  
+  void* FAllocationArea;
 } TSubAllocatedSharedMemory;
 
@@ -34 +34 @@
                                     ULONG Size,
                                     ULONG ReserveSize, // size to reserve at start of memory
-                                    TSubAllocatedSharedMemory* pSharedMemory ); 
+                                    TSubAllocatedSharedMemory* pSharedMemory );
 
 // suballocate space of the given size
@@ -51 +51 @@
 
 #endif
+

trunk/hlpmgr/utility.c

@@ -1 @@
-#include <stdlib.h> 
+#include <stdlib.h>
 #include <string.h>
 
@@ -8 +8 @@
 {
   ULONG buffer;
-  DosQuerySysInfo( QSV_BOOT_DRIVE, 
+  DosQuerySysInfo( QSV_BOOT_DRIVE,
                    QSV_BOOT_DRIVE,
                    & buffer,
@@ -40 +40 @@
   while( TRUE )
   {
-    parent = WinQueryWindow( hwnd, QW_PARENT );    
+    parent = WinQueryWindow( hwnd, QW_PARENT );
     if (    parent == hDesktopWindow
          || parent == NULLHANDLE )
       // this is a frame (top level) window
       break;
-    hwnd = parent; 
+    hwnd = parent;
   }
 
@@ -61 +61 @@
   LogEvent( "IsStandardWindowClass" );
 
-  if ( WinQueryClassName( hwnd, 
+  if ( WinQueryClassName( hwnd,
                           sizeof( szClassName ),
                           szClassName ) == 0 )
@@ -87 +87 @@
                   char* source )
 {
-  if ( *dest != NULL )  
+  if ( *dest != NULL )
   {
     free( *dest );
     *dest = NULL;
   }
-  
-  if ( source == NULL )  
+
+  if ( source == NULL )
     return;
 
@@ -99 +99 @@
   strcpy( *dest, source );
 }
-
+

trunk/hlpmgr/utility.h

@@ -32 +32 @@
 BOOL IsStandardWindowClass( HWND hwnd, PSZ ClassID );
 
-// make a memory copy of the given source string into 
+// make a memory copy of the given source string into
 // dest. Accepts NULLs for either parameter.
 void StoreString( char** dest,
@@ -38 +38 @@
 
 #endif
+