Changeset 6691 in vbox

Timestamp:

Jan 31, 2008 10:06:25 PM (17 years ago)

Author:

vboxsync

Message:

Corrected segment declaration and WEAK definition. Corrected VBoxHlp.h blocker.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/os2

Files:

• VBoxHlp.asm (modified) (3 diffs)
• VBoxHlp.cpp (modified) (9 diffs)
• VBoxHlp.h (modified) (3 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/os2/VBoxHlp.asm

@@ +1 @@
+; $Id:$
 ;; @file
 ;
@@ -9 +10 @@
 ;
 ; Copyright (C) 2008 innotek GmbH
-; 
+;
 ; This file is part of VirtualBox Open Source Edition (OSE), as
 ; available from http://www.virtualbox.org. This file is free software;
@@ -19 +20 @@
 ;
 
-SEGMENT CODE32 CLASS=CODE USE32 FLAT PUBLIC
 
+include "iprt/asmdefs.mac"
+
+
+BEGINCODE
 extern _DLL_InitTerm
 
-; Low-level DLL entry point 
+; Low-level DLL entry point - Forward to the C code.
 ..start:
     jmp _DLL_InitTerm
 
-; Shut up emxomfld (?)
+
+; emxomfld may generate references to this for weak symbols. It is usually
+; found in in libend.lib.
+ABSOLUTE 0
 global WEAK$ZERO
 WEAK$ZERO:
+

trunk/src/VBox/Frontends/VirtualBox/src/os2/VBoxHlp.cpp

@@ +1 @@
+/* $Id$ */
 /** @file
- *
  * VBox frontends: Qt GUI ("VirtualBox"):
  * Implementation of OS/2-specific helpers that require to reside in a DLL
@@ -30 +30 @@
  *  Undocumented PM hook that is called before the pressed key is checked
  *  against the global accelerator table.
- * 
+ *
  *  Taken from the xWorkplace source code where it appears to come from the
  *  ProgramCommander/2 source code. Thanks to Ulrich Moeller and Roman Stangl.
@@ -36 +36 @@
 #define HK_PREACCEL 17
 
-/* NOTE: all global non-static DLL data is per-process (multiple, nonshared) */
+/* NOTE: all global data is per-process (DATA32 is multiple, nonshared). */
 
 /* Module handle of this DLL */
@@ -49 +49 @@
 ULONG gKbdHookMsg = 0;
 
-/** 
+/**
  *  Message Input hook used to monitor the system message queue.
  *
@@ -68 +68 @@
          * gKbdHookHwnd remains NULL. If it's the case while in this input
          * hook, it means that the given foreign process is in foreground
-         * now. Since forwarding should work only for processes that 
+         * now. Since forwarding should work only for processes that
          * called VBoxHlpInstallKbdHook(), we ignore the message. */
         if (gKbdHookHwnd != NULLHANDLE)
@@ -81 +81 @@
 }
 
-/** 
+/**
  *  Installs a hook that will intercept all keyboard input (WM_CHAR) messages
  *  and forward them to the given window handle using the given message
@@ -98 +98 @@
  *  @note This function is not thread-safe and must be called only on the main
  *  thread once per process.
- * 
+ *
  *  @param aHab     Window anchor block.
  *  @param aHwnd    Top-level window handle to forward WM_CHAR messages to.
  *  @param aMsg     Message ID to use when forwarding.
- * 
+ *
  *  @return @c true on success and @c false otherwise.  */
 VBOXHLPDECL(bool) VBoxHlpInstallKbdHook (HAB aHab, HWND aHwnd,
@@ -124 +124 @@
 }
 
-/** 
+/**
  *  Uninstalls the keyboard hook installed by VBoxHlpInstallKbdHook().
  *  All arguments must match arguments passed to VBoxHlpInstallKbdHook(),
@@ -152 +152 @@
 }
 
-/** 
+/**
  *  DLL entry point.
- * 
+ *
  *  @param aHandle  DLL module handle.
  *  @param aFlag    0 on initialization or 1 on termination.
- * 
+ *
  *  @return Non-zero for success or 0 for failure.
  */

trunk/src/VBox/Frontends/VirtualBox/src/os2/VBoxHlp.h

@@ -1 +1 @@
 /** @file
- *
  * VBox frontends: Qt GUI ("VirtualBox"):
  * Declaration of OS/2-specific helpers that require to reside in a DLL
@@ -17 +16 @@
  */
 
-#ifndef __VBoxHlp_h__
-#define __VBoxHlp_h__
+#ifndef ___VBoxHlp_h
+#define ___VBoxHlp_h
 
 #include <iprt/cdefs.h>
@@ -34 +33 @@
                                            unsigned long aMsg);
 
-#endif /* __VBoxHlp_h__ */
+#endif /* !___VBoxHlp_h */