Changeset 71784 in vbox for trunk/src/VBox/Frontends
- Timestamp:
- Apr 9, 2018 3:56:21 PM (7 years ago)
- Location:
- trunk/src/VBox/Frontends/VirtualBox
- Files:
-
- 7 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/VBox/Frontends/VirtualBox/Makefile.kmk
r71679 r71784 400 400 # This one is global shared GUI library: 401 401 ifdef VBOX_GUI_WITH_SHARED_LIBRARY 402 VirtualBox_LIBS += $(PATH_STAGE_DLL)/VBoxGlobal$(VBOX_SUFF_DLL) 402 ifeq ($(KBUILD_TARGET),win) 403 VirtualBox_LIBS += $(PATH_STAGE_LIB)/VBoxGlobal$(VBOX_SUFF_LIB) 404 else 405 VirtualBox_LIBS += $(PATH_STAGE_DLL)/VBoxGlobal$(VBOX_SUFF_DLL) 406 endif 403 407 endif 404 408 … … 413 417 VBoxGlobal_LIBS.solaris += Xinerama 414 418 VBoxGlobal_LIBS.freebsd += Xinerama 419 420 # Various Windows hosts libraries: 421 VBoxGlobal_LIBS.win = \ 422 $(PATH_SDK_$(VBOX_WINPSDK)_LIB)/Htmlhelp.Lib 415 423 416 424 # VBox keyboard shared library for X11 hosts: … … 1102 1110 VirtualBox_SOURCES.win += \ 1103 1111 src/platform/win/VirtualBox.rc \ 1104 src/platform/win/UIDesktopServices_win.cpp \ 1105 src/platform/win/WinKeyboard.cpp 1112 src/platform/win/UIDesktopServices_win.cpp 1106 1113 1107 1114 VirtualBox_SOURCES.darwin += \ … … 1215 1222 1216 1223 VirtualBox_SOURCES.win += \ 1217 src/platform/win/VBoxUtils-win.cpp 1224 src/platform/win/VBoxUtils-win.cpp \ 1225 src/platform/win/WinKeyboard.cpp 1218 1226 1219 1227 VirtualBox_SOURCES.darwin += \ … … 1313 1321 1314 1322 VBoxGlobal_SOURCES.win += \ 1315 src/platform/win/VBoxUtils-win.cpp 1323 src/platform/win/VBoxUtils-win.cpp \ 1324 src/platform/win/WinKeyboard.cpp 1316 1325 1317 1326 VBoxGlobal_SOURCES.darwin += \ … … 1454 1463 $(QUIET)$(RM) -f -- "$@" "$(PATH_TARGET)/VirtualBoxComWrapperFiles.dep" 1455 1464 $(QUIET)$(VBOX_XSLTPROC) -o $@ \ 1456 1465 $(VBOX_VIRTUALBOX_SRC)/src/globals/COMWrappers.xsl $< 1457 1466 $(QUIET)$(VBOX_FILESPLIT) $@ $(VirtualBox_0_OUTDIR)/include \ 1458 1467 $(PATH_TARGET)/VirtualBoxComWrapperFiles.dep VirtualBox_VBOX_COMWRAPPERS -
trunk/src/VBox/Frontends/VirtualBox/src/globals/QIWithRetranslateUI.h
r71354 r71784 25 25 #include <QObject> 26 26 #include <QWidget> 27 28 /* GUI includes: */ 29 #include "UILibraryDefs.h" 27 30 28 31 … … 60 63 virtual void retranslateUi() = 0; 61 64 }; 65 66 #ifdef VBOX_GUI_WITH_SHARED_LIBRARY 67 /** Explicit QIWithRetranslateUI instantiation for QWidget class. 68 * @note On Windows it's important that all template cases are instantiated just once across 69 * the linking space. In case we have particular template case instantiated from both 70 * library and executable sides, - we have multiple definition case and need to strictly 71 * ask compiler to do it just once and link such cases against library only. 72 * I would also note that it would be incorrect to just make whole the template exported 73 * to library because latter can have lack of required instantiations (current case). */ 74 template class SHARED_LIBRARY_STUFF QIWithRetranslateUI<QWidget>; 75 #endif 62 76 63 77 -
trunk/src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.h
r71630 r71784 642 642 UIThreadPool *m_pThreadPool; 643 643 644 #if defined(VBOX_WS_WIN) && defined(VBOX_GUI_WITH_SHARED_LIBRARY) 645 /** Holds the ATL module instance (for use with VBoxGlobal shared library only). 646 * @note Required internally by ATL (constructor records instance in global variable). */ 647 ATL::CComModule _Module; 648 #endif 649 644 650 /** Holds the singleton VBoxGlobal instance. */ 645 651 static VBoxGlobal *s_pInstance; -
trunk/src/VBox/Frontends/VirtualBox/src/platform/win/VBoxUtils-win.cpp
r69500 r71784 1 1 /* $Id$ */ 2 2 /** @file 3 * VBox Qt GUI - Utility classes and functions for handling Winspecific tasks.3 * VBox Qt GUI - Declarations of utility classes and functions for handling Windows specific tasks. 4 4 */ 5 5 6 6 /* 7 * Copyright (C) 2010-201 7Oracle Corporation7 * Copyright (C) 2010-2018 Oracle Corporation 8 8 * 9 9 * This file is part of VirtualBox Open Source Edition (OSE), as … … 16 16 */ 17 17 18 /* Includes: */18 /* GUI includes: */ 19 19 #include "VBoxUtils-win.h" 20 20 21 /* Namespace for native window sub-system functions: */ 21 22 /** Namespace for native window sub-system functions. */ 22 23 namespace NativeWindowSubsystem 23 24 { 24 /* Enumerates visible always-on-top (top-most) windows:*/25 /** Enumerates visible always-on-top (top-most) windows. */ 25 26 BOOL CALLBACK EnumWindowsProc(HWND hWnd, LPARAM lParam); 26 /* Contain visible top-most-window rectangles:*/27 /** Contains visible top-most-window rectangles. */ 27 28 QList<QRect> topMostRects; 28 29 } 29 30 30 /* Enumerates visible always-on-top (top-most) windows: */ 31 BOOL CALLBACK NativeWindowSubsystem::EnumWindowsProc(HWND hWnd, LPARAM /* lParam */) 31 BOOL CALLBACK NativeWindowSubsystem::EnumWindowsProc(HWND hWnd, LPARAM) 32 32 { 33 33 /* Ignore NULL HWNDs: */ … … 60 60 } 61 61 62 /* Returns area covered by visible always-on-top (top-most) windows: */63 62 const QRegion NativeWindowSubsystem::areaCoveredByTopMostWindows() 64 63 { -
trunk/src/VBox/Frontends/VirtualBox/src/platform/win/VBoxUtils-win.h
r69500 r71784 1 1 /* $Id$ */ 2 2 /** @file 3 * VBox Qt GUI - Declarations of utility classes and functions for handling Win specific tasks.3 * VBox Qt GUI - Declarations of utility classes and functions for handling Windows specific tasks. 4 4 */ 5 5 6 6 /* 7 * Copyright (C) 2011-201 7Oracle Corporation7 * Copyright (C) 2011-2018 Oracle Corporation 8 8 * 9 9 * This file is part of VirtualBox Open Source Edition (OSE), as … … 16 16 */ 17 17 18 #ifndef ___VBoxUtils_ WIN_h___19 #define ___VBoxUtils_ WIN_h___18 #ifndef ___VBoxUtils_win_h___ 19 #define ___VBoxUtils_win_h___ 20 20 21 21 /* Qt includes: */ 22 22 #include <QRegion> 23 23 24 /* Platform includes: */ 24 /* GUI includes: */ 25 #include "UILibraryDefs.h" 26 27 /* External includes: */ 25 28 #include <iprt/win/windows.h> 26 29 … … 29 32 { 30 33 /* Returns area covered by visible always-on-top (top-most) windows: */ 31 const QRegion areaCoveredByTopMostWindows();34 SHARED_LIBRARY_STUFF const QRegion areaCoveredByTopMostWindows(); 32 35 } 33 36 34 #endif 35 37 #endif /* !___VBoxUtils_win_h___ */ -
trunk/src/VBox/Frontends/VirtualBox/src/platform/win/WinKeyboard.cpp
r71027 r71784 1 1 /* $Id$ */ 2 2 /** @file 3 * VBox Qt GUI - Windows keyboard handling..3 * VBox Qt GUI - Declarations of utility functions for handling Windows Keyboard specific tasks. 4 4 */ 5 5 6 6 /* 7 * Copyright (C) 2014-201 7Oracle Corporation7 * Copyright (C) 2014-2018 Oracle Corporation 8 8 * 9 9 * This file is part of VirtualBox Open Source Edition (OSE), as … … 16 16 */ 17 17 18 /* Defines: */ 18 19 #define LOG_GROUP LOG_GROUP_GUI 19 20 21 /* GUI includes: */ 20 22 #include "WinKeyboard.h" 23 24 /* Other VBox includes: */ 21 25 #include <iprt/assert.h> 22 26 #include <VBox/log.h> 23 27 28 /* External includes: */ 24 29 #include <stdio.h> 25 30 -
trunk/src/VBox/Frontends/VirtualBox/src/platform/win/WinKeyboard.h
r71027 r71784 1 1 /* $Id$ */ 2 2 /** @file 3 * VBox Qt GUI - Windows keyboard handling..3 * VBox Qt GUI - Declarations of utility functions for handling Windows Keyboard specific tasks. 4 4 */ 5 5 6 6 /* 7 * Copyright (C) 2014-201 7Oracle Corporation7 * Copyright (C) 2014-2018 Oracle Corporation 8 8 * 9 9 * This file is part of VirtualBox Open Source Edition (OSE), as … … 19 19 #define ___WinKeyboard_h___ 20 20 21 /* Platform includes: */ 21 /* GUI includes: */ 22 #include "UILibraryDefs.h" 23 24 /* Other VBox includes: */ 22 25 #include <iprt/win/windows.h> 23 26 24 void * WinHidDevicesKeepLedsState(void);25 void WinHidDevicesApplyAndReleaseLedsState(void *pData);26 void WinHidDevicesBroadcastLeds(bool fNumLockOn, bool fCapsLockOn, bool fScrollLockOn);27 SHARED_LIBRARY_STUFF void * WinHidDevicesKeepLedsState(void); 28 SHARED_LIBRARY_STUFF void WinHidDevicesApplyAndReleaseLedsState(void *pData); 29 SHARED_LIBRARY_STUFF void WinHidDevicesBroadcastLeds(bool fNumLockOn, bool fCapsLockOn, bool fScrollLockOn); 27 30 28 bool winHidLedsInSync(bool fNumLockOn, bool fCapsLockOn, bool fScrollLockOn);31 SHARED_LIBRARY_STUFF bool winHidLedsInSync(bool fNumLockOn, bool fCapsLockOn, bool fScrollLockOn); 29 32 30 33 /** Helper class to deal with Windows AltGr handling. … … 39 42 * unwanted event at source, it should still make guest system keyboard handling 40 43 * work correctly. */ 41 class WinAltGrMonitor44 class SHARED_LIBRARY_STUFF WinAltGrMonitor 42 45 { 43 46 public:
Note:
See TracChangeset
for help on using the changeset viewer.