Changeset 365 for trunk/hlpmgr

Timestamp:

Feb 5, 2010, 8:58:28 PM (16 years ago)

Author:

RBRi

Message:

format updates

File:

• trunk/hlpmgr/helpmgr.c (modified) (62 diffs)

trunk/hlpmgr/helpmgr.c

@@ -1 +1 @@
 // Standard library
-#include <string.h> 
-#include <stdlib.h> 
+#include <string.h>
+#include <stdlib.h>
 #include <stdio.h>
 
@@ -61 +61 @@
 int g_HelpInstanceCount = 0;
 
-// 
-
-MRESULT APIENTRY HelpManagerWndProc( HWND hwnd, 
-                                     ULONG msg, 
-                                     MPARAM mp1, 
+//
+
+MRESULT APIENTRY HelpManagerWndProc( HWND hwnd,
+                                     ULONG msg,
+                                     MPARAM mp1,
                                      MPARAM mp2 );
 
@@ -75 +75 @@
 
 
-// Find if there is a help instance associated with 
+// Find if there is a help instance associated with
 // this window
 //--------------------------------------------------------------------------------
@@ -85 +85 @@
   LogEvent( "  GetAssociatedHelpInstance" );
 
-  for ( i = 0; i < MAX_HELP_INSTANCES; i ++ ) 
+  for ( i = 0; i < MAX_HELP_INSTANCES; i ++ )
   {
     pHelpInstance = g_pHelpInstances[ i ];
@@ -91 +91 @@
     {
       LogEvent( "    Instance %d: %8x", i, pHelpInstance );
-      if ( IsWindowAssociated( pHelpInstance, 
+      if ( IsWindowAssociated( pHelpInstance,
                                hwnd ) )
       {
@@ -99 +99 @@
     }
   }
-  
+
   return NULL;
 }
@@ -112 +112 @@
   HWND hwnd;
   HWND hClientWnd;
-  TPHelpInstance pHelpInstance;  
+  TPHelpInstance pHelpInstance;
   LONG SearchType;
 
   LogEvent( "QueryHelpInstance" );
 
-  hDesktopWindow = WinQueryDesktopWindow( WinQueryAnchorBlock( hwndApp ), 
+  hDesktopWindow = WinQueryDesktopWindow( WinQueryAnchorBlock( hwndApp ),
                                           NULLHANDLE );
 
@@ -145 +145 @@
           LogEvent( "        Found help instance: %8x", pHelpInstance );
           return pHelpInstance;
-        }      
+        }
       }
       else
@@ -152 +152 @@
       }
     }
-     
+
     LogEvent( "  No help instance" );
 
@@ -180 +180 @@
     }
     hwnd = parentOrOwner;
-  }  
+  }
 
   LogEvent( "  No help instance found" );
@@ -203 +203 @@
   LogEvent( "--------------------------------------------------" );
   LogEvent( "NHM32CreateHelpInstance" );
-  LogEvent( "  Help Manager Version: %s", 
-            HelpMgrVersion );
-
-  LogEvent( "  Filename(s): %s", 
-            phinitHMInitStructure -> pszHelpLibraryName );
-  LogEvent( "  Title: %s", 
-            phinitHMInitStructure -> pszHelpWindowTitle );
+  LogEvent( "  Help Manager Version: %s", HelpMgrVersion );
+  LogEvent( "  Filename(s): %s", phinitHMInitStructure -> pszHelpLibraryName );
+  LogEvent( "  Title: %s",       phinitHMInitStructure -> pszHelpWindowTitle );
 
   pHelpInstance = MakeNewHelpInstance();
@@ -215 +211 @@
   // find blank slot in help instance array
   FoundUnusedSlot = FALSE;
-  for ( i = 0; i < MAX_HELP_INSTANCES; i ++ ) 
+  for ( i = 0; i < MAX_HELP_INSTANCES; i ++ )
   {
     if ( g_pHelpInstances[ i ] == NULL )
@@ -226 +222 @@
   if ( ! FoundUnusedSlot )
   {
-    LogEvent( "Too many help instances, out of slots" );    
+    LogEvent( "Too many help instances, out of slots" );
     return NULLHANDLE;
   }
-      
+
   g_HelpInstanceCount ++;
 
@@ -242 +238 @@
   {
     rc = WinGetLastError( hab );
-    LogEvent( "WinRegisterClass failed, error=%d", rc );    
+    LogEvent( "WinRegisterClass failed, error=%d", rc );
     return NULLHANDLE;
   }
@@ -249 +245 @@
 
   // Create help window as an object window (child of HWND_OBJECT)
-  pHelpInstance -> FHandle = 
+  pHelpInstance -> FHandle =
     WinCreateWindow( HWND_OBJECT,           // parent: object window
                      szNewHelpManagerClass, // window class
@@ -260 +256 @@
                      NULL,                  // control data - none
                      NULL );                // presentation parameters - none
-  
+
   if ( pHelpInstance -> FHandle == NULLHANDLE )
   {
@@ -271 +267 @@
   // store instance pointer and magic number for checking later.
   // Could just have used class name!
-  WinSetWindowULong( pHelpInstance -> FHandle, 
+  WinSetWindowULong( pHelpInstance -> FHandle,
                      QWL_HELPINSTANCEMAGICNUMBER,
                      HELPINSTANCEMAGICNUMBER );
-  WinSetWindowULong( pHelpInstance -> FHandle, 
+  WinSetWindowULong( pHelpInstance -> FHandle,
                      QWL_HELPINSTANCEPTR,
                      (ULONG) pHelpInstance );
@@ -308 +304 @@
   pHelpInstance -> HelpTableFromResource = FALSE;
 
-  if ( HelpTable != 0 ) 
+  if ( HelpTable != 0 )
   {
     if ( ( HelpTable & 0xffff0000 ) == 0xffff0000 )
@@ -329 +325 @@
   else
   {
-    pHelpInstance -> pHelpTable = NULL;   
+    pHelpInstance -> pHelpTable = NULL;
   }
 
@@ -336 +332 @@
   pHelpInstance -> FViewerStartupMessagesCount = 0;
 
-  LogEvent( "  Allocating shared memory: %s",
-            SHARED_MEM_NAME );
+  LogEvent( "  Allocating shared memory: %s", SHARED_MEM_NAME );
   rc = GetSubAllocatedSharedMemory( SHARED_MEM_NAME,
                                     SHARED_MEM_SIZE,
@@ -347 +342 @@
     return NULLHANDLE;
   }
-  pSharedStruct = 
+  pSharedStruct =
     (TNewHelpMgrSharedStruct*) pHelpInstance -> SharedMemory.FMem.FPointer;
 
-  strcpy( pSharedStruct -> Title,
-          "NewView Help Manager" );
-  strcpy( pSharedStruct -> Version,
-          HelpMgrVersion );
+  strcpy( pSharedStruct -> Title, "NewView Help Manager" );
+  strcpy( pSharedStruct -> Version, HelpMgrVersion );
 
   phinitHMInitStructure -> ulReturnCode = 0;
@@ -381 +374 @@
 
   // remove from list
-  for ( i = 0; i < MAX_HELP_INSTANCES; i ++ ) 
+  for ( i = 0; i < MAX_HELP_INSTANCES; i ++ )
     if ( g_pHelpInstances[ i ] == pHelpInstance )
       g_pHelpInstances[ i ] = NULL;
@@ -443 +436 @@
 
   // Notify the window (Only required by SmartSuite?)
-  WinSendMsg( hwndApp, 
-              WM_SETHELPINFO, 
-              (MPARAM) hwndHelpInstance, 
+  WinSendMsg( hwndApp,
+              WM_SETHELPINFO,
+              (MPARAM) hwndHelpInstance,
               0 );
   // Note this call seems to fail on some apps, so ignore result
@@ -454 +447 @@
     LogEvent( "  Help Instance NULLHANDLE, clearing" );
 
-    for ( i = 0; i < MAX_HELP_INSTANCES; i ++ ) 
-    {
-      pHelpInstance = g_pHelpInstances[ i ]; 
-      if ( pHelpInstance != NULL ) 
-      {
-        RemoveAssociatedWindow( pHelpInstance, 
+    for ( i = 0; i < MAX_HELP_INSTANCES; i ++ )
+    {
+      pHelpInstance = g_pHelpInstances[ i ];
+      if ( pHelpInstance != NULL )
+      {
+        RemoveAssociatedWindow( pHelpInstance,
                                 hwndApp );
       }
@@ -471 +464 @@
   else
     LogEvent( "  Window Title: Blank/invalid" );
-   
+
   pHelpInstance = GetHelpInstance( hwndHelpInstance );
   if ( pHelpInstance == NULL )
@@ -546 +539 @@
 // Portions contributed by Aaron Reed at IBM
 
-// typedef void _Far16 * HWND16; 
+// typedef void _Far16 * HWND16;
 typedef HWND HWND16;
 typedef USHORT BOOL16;
@@ -562 +555 @@
     PHELPSUBTABLE phstHelpSubTable;
     USHORT        idExtPanel;
-  
+
 } HELPTABLE16, _Far16 *PHELPTABLE16;
 
@@ -578 +571 @@
     USHORT       usShowPanelId;
     PSZ16        pszHelpLibraryName;
-  
+
 } HELPINIT16, _Far16 *PHELPINIT16;
 
@@ -608 +601 @@
   HelpTable = (ULONG) phinitHMInitStructure -> phtHelpTable;
   LogEvent( "    Help Table: %8x", HelpTable );
-  if ( HelpTable ) 
+  if ( HelpTable )
   {
     if ( ( HelpTable & 0xffff0000 ) == 0xffff0000 )
@@ -620 +613 @@
       // It's a pointer, so convert 16->32
       LogEvent( "    Converting pointer" );
-      helpinit.phtHelpTable = 
+      helpinit.phtHelpTable =
         (PHELPTABLE) (PHELPTABLE16) HelpTable;
     }
   }
 
-  helpinit.hmodHelpTableModule = 
+  helpinit.hmodHelpTableModule =
     (HMODULE) phinitHMInitStructure -> hmodHelpTableModule;
-  helpinit.pszHelpWindowTitle = 
+  helpinit.pszHelpWindowTitle =
     (PSZ) phinitHMInitStructure -> pszHelpWindowTitle;
-  helpinit.pszHelpLibraryName = 
+  helpinit.pszHelpLibraryName =
     (PSZ) phinitHMInitStructure -> pszHelpLibraryName;
-    
+
   LogEvent( "  Conversions done, calling 32 bit" );
 
   hInstance = NHM32CreateHelpInstance( hab, &helpinit );
- 
+
   LogEvent( "  32 bit returned, copying result code" );
 
@@ -663 +656 @@
 {
   LogEvent( "NHM16AssociateHelpInstance" );
-  return NHM32AssociateHelpInstance( (HWND) hwndHelpInstance, 
+  return NHM32AssociateHelpInstance( (HWND) hwndHelpInstance,
                                      (HWND) hwndApp );
 }
@@ -755 +748 @@
 
   if ( ChildControlID != (USHORT) -1 )
-  {  
-    // Child control -1 means not applicable (e.g. top level menu)    
+  {
+    // Child control -1 means not applicable (e.g. top level menu)
     if ( FindIDInHelpSubTable( ChildControlID,
                                pHelpSubTable,
                                pHelpPanelID ) )
     {
-      LogEvent( "  Found Child Control ID, Panel: %hu", 
+      LogEvent( "  Found Child Control ID, Panel: %hu",
                 *pHelpPanelID );
       return TRUE;
@@ -777 +770 @@
                              pHelpSubTable,
                              pHelpPanelID ) )
-  { 
-    LogEvent( "  Found Control ID, Panel: %hu", 
+  {
+    LogEvent( "  Found Control ID, Panel: %hu",
               *pHelpPanelID );
     return TRUE;
@@ -785 +778 @@
   LogEvent( "  Control ID not found" );
 
-  // Control not found, we can only show help for the 
-  // Window as a whole. First, see if the subtable 
-  // has an entry for the window 
+  // Control not found, we can only show help for the
+  // Window as a whole. First, see if the subtable
+  // has an entry for the window
   if ( FindIDInHelpSubTable( WindowID,
                              pHelpSubTable,
                              pHelpPanelID ) )
   {
-    LogEvent( "  Found Window ID in subtable, Panel: %hu", 
+    LogEvent( "  Found Window ID in subtable, Panel: %hu",
               *pHelpPanelID );
     return TRUE;
@@ -808 +801 @@
 //--------------------------------------------------------------------------------
 // Help Hook function
-// 
+//
 // installed during WinCreateHelpInstance
 //
-// This function is called by the standard OS/2 windows on 
+// This function is called by the standard OS/2 windows on
 // WM_HELP messages.
-// 
+//
 // Notes:
 //   The parameters are ULONG but passed from USHORTs
@@ -833 +826 @@
   USHORT ChildControlID;
   USHORT Mode;
-  
+
   ControlID = (USHORT) ulControlID;
   ChildControlID = (USHORT) ulChildControlID;
   Mode = (USHORT) ulMode;
-  
+
   LogEvent( "--------------------------------------------------" );
   LogEvent( "HelpHook" );
@@ -852 +845 @@
 
   pHelpInstance = GetHelpInstanceForWindowChain( hFocusWindow );
-  
+
   if ( pHelpInstance == NULL )
   {
@@ -867 +860 @@
   switch( Mode )
   {
-    case HLPM_MENU:    
+    case HLPM_MENU:
       LogEvent( "  Menu Mode" );
-      LogEvent( "  Frame: %x", hFocusFrame );            
+      LogEvent( "  Frame: %x", hFocusFrame );
       break;
 
@@ -883 +876 @@
       {
         // override if active window set.
-        WindowID = WinQueryWindowUShort( pHelpInstance -> FActiveWindow, 
+        WindowID = WinQueryWindowUShort( pHelpInstance -> FActiveWindow,
                                          QWS_ID );
         LogEvent( "    Active window set; overriding, Window ID: %d", WindowID );
@@ -895 +888 @@
   LogEvent( "  Child Control ID: %hu", (USHORT) ChildControlID );
 
-  if ( pHelpInstance -> pHelpTable == NULL ) 
+  if ( pHelpInstance -> pHelpTable == NULL )
   {
     LogEvent( "  No Help Table loaded for instance" );
@@ -902 +895 @@
 
   if ( ! FindHelpTopic( pHelpInstance,
-                        WindowID, 
+                        WindowID,
                         ControlID,
                         ChildControlID,
@@ -927 +920 @@
 //--------------------------------------------------------------------------------
 
-MRESULT APIENTRY HelpManagerWndProc( HWND hwnd, 
-                                     ULONG msg, 
-                                     MPARAM mp1, 
+MRESULT APIENTRY HelpManagerWndProc( HWND hwnd,
+                                     ULONG msg,
+                                     MPARAM mp1,
                                      MPARAM mp2 )
-{  
+{
   USHORT PanelID;
   char buffer[ 256 ];
@@ -945 +938 @@
   char* pMessageMem;
   HWND hAppWindow;
-  
+
   if (    msg == WM_CREATE
        || msg == WM_DESTROY
@@ -952 +945 @@
     return 0;
 
-  if (    msg >= WM_USER 
+  if (    msg >= WM_USER
        && msg != NHM_VIEWER_READY
        && msg != NHM_FORGET_VIEWER )
@@ -963 +956 @@
 
   pHelpInstance = GetHelpInstance( hwnd );
-  if ( pHelpInstance == NULL ) 
+  if ( pHelpInstance == NULL )
   {
     LogEvent( "  Not a valid help manager window" );
@@ -980 +973 @@
   LogEvent( "  Message:      %8x", msg );
   LogEvent( "  App Window:   %8x", (ULONG) hAppWindow );
-  
+
   switch( msg )
   {
-    case HM_HELP_CONTENTS: 
+    case HM_HELP_CONTENTS:
       LogEvent( "HM_HELP_CONTENTS" );
       EnsureViewerRunning( pHelpInstance );
-      PostViewerMessage( pHelpInstance, 
-                         NHM_HELP_CONTENTS, 
-                         0, 
+      PostViewerMessage( pHelpInstance,
+                         NHM_HELP_CONTENTS,
+                         0,
                          0 );
       break;
 
-    case HM_HELP_INDEX: 
+    case HM_HELP_INDEX:
       LogEvent( "HM_HELP_INDEX" );
       EnsureViewerRunning( pHelpInstance );
       PostViewerMessage( pHelpInstance,
-                         NHM_HELP_INDEX, 
-                         0, 
+                         NHM_HELP_INDEX,
+                         0,
                          0 );
       break;
 
-    case HM_DISPLAY_HELP: 
+    case HM_DISPLAY_HELP:
       LogEvent( "  HM_DISPLAY_HELP" );
       switch( (ULONG) mp2 )
@@ -1041 +1034 @@
                              (MPARAM) pMessageMem,
                              0 );
-          
+
           break;
       }
@@ -1053 +1046 @@
       // find active window
       hFrameWindow = GetTopLevelWindow( WinQueryFocus( HWND_DESKTOP ) );
-      
+
       // get ID
       WindowID = WinQueryWindowUShort( hFrameWindow, QWS_ID );
@@ -1073 +1066 @@
       break;
 
-    case HM_KEYS_HELP: 
+    case HM_KEYS_HELP:
       LogEvent( "HM_KEYS_HELP" );
       if ( hAppWindow == NULLHANDLE )
@@ -1079 +1072 @@
         LogEvent( "  No app windows; can't ask for keys help topic" );
         return 0;
-      }        
-      PanelID = 
+      }
+      PanelID =
         (USHORT) WinSendMsg( hAppWindow,
                              HM_QUERY_KEYS_HELP,
@@ -1094 +1087 @@
                            0 );
       }
-                          
-      break;
-    
+
+      break;
+
     case HM_DISMISS_WINDOW:
       LogEvent( "HM_DISMISS_WINDOW" );
@@ -1117 +1110 @@
       LogEvent( "  Filename(s): %s", (char*) mp1 );
       StoreString( & pHelpInstance -> FHelpFileNames,
-                   (char*) mp1 ); 
+                   (char*) mp1 );
       if ( pHelpInstance -> FViewerStarted )
       {
@@ -1148 +1141 @@
                            0 );
       }
-      break;   
+      break;
 
     case HM_LOAD_HELP_TABLE:
@@ -1154 +1147 @@
       NHM32LoadHelpTable( pHelpInstance -> FHandle,
                           SHORT1FROMMP( mp1 ),
-                          (HMODULE) mp2 ); 
+                          (HMODULE) mp2 );
       break;
 
@@ -1170 +1163 @@
       PostQueuedViewerMessages( pHelpInstance );
       break;
-    
+
     case NHM_FORGET_VIEWER:
       // viewer notifying us it is now doing something else
@@ -1177 +1170 @@
       pHelpInstance -> FViewerStarted = FALSE;
       pHelpInstance -> FViewerWindow = NULLHANDLE;
-      break;      
+      break;
 
 /*
-// This is worse han useless because View.exe 
-   is just the stub and will always exit immediately. 
-    case WM_APPTERMINATENOTIFY:  
+// This is worse han useless because View.exe
+   is just the stub and will always exit immediately.
+    case WM_APPTERMINATENOTIFY:
       // viewer has stopped
       LogEvent( "Viewer has stopped" );
@@ -1200 +1193 @@
       LogEvent( "  Ignoring unsupported: HM_REPLACE_USING_HELP" );
       break;
-       
+
     case HM_SET_OBJCOM_WINDOW:
       LogEvent( "  Ignoring unsupported: HM_SET_OBJCOM_WINDOW" );
@@ -1237 +1230 @@
       break;
 
-    default: 
-      LogEvent( "  Unrecognised Message: %x", msg );   
+    default:
+      LogEvent( "  Unrecognised Message: %x", msg );
   }
 
@@ -1255 +1248 @@
     if ( pHelpInstance != NULL )
     {
-      LogEvent( "    %8x (handle: %8x) active, destroying", 
+      LogEvent( "    %8x (handle: %8x) active, destroying",
                 pHelpInstance,
                 pHelpInstance -> FHandle );
@@ -1272 +1265 @@
   LogEvent( "--------------------------------------------------" );
 
-  GetApplicationFilename( ApplicationFilename, 
+  GetApplicationFilename( ApplicationFilename,
                           sizeof( ApplicationFilename ) );
 
@@ -1289 +1282 @@
   LogEvent( "--------------------------------------------------" );
 
-  GetApplicationFilename( ApplicationFilename, 
+  GetApplicationFilename( ApplicationFilename,
                           sizeof( ApplicationFilename ) );
 
@@ -1303 +1296 @@
 // Tested - still required on Watcom 11.0c, OW 1.0, 1.1, 1.2rc3
 // NOTE! This function DOES NOT get called
-unsigned LibMain( unsigned hmod, unsigned termination ) 
+unsigned LibMain( unsigned hmod, unsigned termination )
 {
   return 1;