VirtualBox

Changeset 63311 in vbox

Timestamp:

Aug 11, 2016 12:02:38 AM (9 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

109944

Message:

Use shlobj.h wrapper.

Location:

Files:

: 15 edited

Additions/WINNT/VBoxTray/VBoxDnDDataObject.cpp (modified) (1 diff)
Additions/WINNT/VBoxTray/VBoxDnDDropTarget.cpp (modified) (1 diff)
Additions/common/VBoxService/testcase/tstUserInfo.cpp (modified) (1 diff)
Frontends/VirtualBox/src/extensions/QIFileDialog.cpp (modified) (1 diff)
Frontends/VirtualBox/src/globals/VBoxGlobal.cpp (modified) (1 diff)
Frontends/VirtualBox/src/platform/win/UIDesktopServices_win.cpp (modified) (2 diffs)
Frontends/VirtualBox/src/precomp.h (modified) (1 diff)
Frontends/VirtualBox/src/runtime/UIDnDDataObject_win.cpp (modified) (1 diff)
HostDrivers/VBoxNetFlt/win/cfg/VBoxNetCfg.cpp (modified) (1 diff)
HostDrivers/win/cfg/VBoxDrvCfg.cpp (modified) (1 diff)
Installer/win/InstallHelper/VBoxInstallHelper.cpp (modified) (1 diff)
Installer/win/Stub/VBoxStub.cpp (modified) (1 diff)
Main/src-server/HostImpl.cpp (modified) (1 diff)
Main/src-server/win/NetIf-win.cpp (modified) (1 diff)
Runtime/r3/win/path-win.cpp (modified) (1 diff)

Legend:

: Unmodified
: Added
: Removed

trunk/src/VBox/Additions/WINNT/VBoxTray/VBoxDnDDataObject.cpp

r63104	r63311
17	17	#include <iprt/win/windows.h>
18	18	#include <new> /* For bad_alloc. */
19		#include <shlobj.h>
	19	#include <iprt/win/shlobj.h>
20	20
21	21	#include <iprt/path.h>

trunk/src/VBox/Additions/WINNT/VBoxTray/VBoxDnDDropTarget.cpp

r63104	r63311
17	17	#include <iprt/win/windows.h>
18	18	#include <new> /* For bad_alloc. */
19		#include <Shlobj.h> /* For DROPFILES and friends. */
	19	#include <iprt/win/shlobj.h> /* For DROPFILES and friends. */
20	20
21	21	#include "VBoxTray.h"

trunk/src/VBox/Additions/common/VBoxService/testcase/tstUserInfo.cpp

r62679	r63311
22	22	#ifdef RT_OS_WINDOWS
23	23	# include <iprt/win/windows.h>
24		# include <Shlobj.h>
	24	# include <iprt/win/shlobj.h>
25	25	#endif
26	26

trunk/src/VBox/Frontends/VirtualBox/src/extensions/QIFileDialog.cpp

r62493	r63311
33	33
34	34	/* WinAPI includes */
35		# include ~~"shlobj.h"~~
	35	# include <iprt/win/shlobj.h>
36	36	# endif /* !VBOX_WS_WIN */
37	37

trunk/src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.cpp

r63175	r63311
130	130	/* External includes: */
131	131	# ifdef VBOX_WS_WIN
132		# include ~~"shlobj.h"~~
	132	# include <iprt/win/shlobj.h>
133	133	# endif /* VBOX_WS_WIN */
134	134

trunk/src/VBox/Frontends/VirtualBox/src/platform/win/UIDesktopServices_win.cpp

-              r62493
+              r63311
 /* System includes */
 # include <shlobj.h>
+# include <iprt/win/shlobj.h>
 #endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
 …
     QString strTmp = QDir::toNativeSeparators(fi.absolutePath());
     int rc = (int)ShellExecute(NULL, L"explore", strTmp.utf16(), NULL, NULL, SW_SHOWNORMAL);
+    intptr_t rc = (intptr_t)ShellExecute(NULL, L"explore", strTmp.utf16(), NULL, NULL, SW_SHOWNORMAL);
     return rc > 32 ? true : false;

trunk/src/VBox/Frontends/VirtualBox/src/precomp.h

r63175	r63311
217	217	*/
218	218	#ifdef VBOX_WS_WIN
219		# include <shlobj.h>
	219	# include <iprt/win/shlobj.h>
220	220	# include <iprt/win/windows.h>
221	221	#endif

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIDnDDataObject_win.cpp

r62679	r63311
25	25	#include <iprt/win/windows.h>
26	26	#include <new> /* For bad_alloc. */
27		#include <shlobj.h>
	27	#include <iprt/win/shlobj.h>
28	28
29	29	#include <iprt/path.h>

trunk/src/VBox/HostDrivers/VBoxNetFlt/win/cfg/VBoxNetCfg.cpp

r62780	r63311
22	22	#include <stdio.h>
23	23	#include <regstr.h>
24		#include <shlobj.h>
	24	#include <iprt/win/shlobj.h>
25	25	#include <cfgmgr32.h>
26	26	#include <tchar.h>

trunk/src/VBox/HostDrivers/win/cfg/VBoxDrvCfg.cpp

r62686	r63311
23	23
24	24	#include <iprt/win/setupapi.h>
25		#include <shlobj.h>
	25	#include <iprt/win/shlobj.h>
26	26
27	27	#include <string.h>

trunk/src/VBox/Installer/win/InstallHelper/VBoxInstallHelper.cpp

r63237	r63311
43	43	#include <iprt/win/objbase.h>
44	44	#include <iprt/win/setupapi.h>
45		#include <shlobj.h>
	45	#include <iprt/win/shlobj.h>
46	46	#include <cfgmgr32.h>
47	47

trunk/src/VBox/Installer/win/Stub/VBoxStub.cpp

r63131	r63311
33	33	#include <iprt/win/objbase.h>
34	34
35		#include <shlobj.h>
	35	#include <iprt/win/shlobj.h>
36	36	#include <stdlib.h>
37	37	#include <stdio.h>

trunk/src/VBox/Main/src-server/HostImpl.cpp

r62780	r63311
125	125	# include <iprt/win/objbase.h>
126	126	//# include <iprt/win/setupapi.h>
127		# include <shlobj.h>
	127	# include <iprt/win/shlobj.h>
128	128	# include <cfgmgr32.h>
129	129	# include <tchar.h>

trunk/src/VBox/Main/src-server/win/NetIf-win.cpp

r63256	r63311
61	61	#include <iprt/win/objbase.h>
62	62	#include <iprt/win/setupapi.h>
63		#include <shlobj.h>
	63	#include <iprt/win/shlobj.h>
64	64	#include <cfgmgr32.h>
65	65

trunk/src/VBox/Runtime/r3/win/path-win.cpp

r62592	r63311
31	31	#define LOG_GROUP RTLOGGROUP_PATH
32	32	#include <iprt/win/windows.h>
33		#include <Shlobj.h>
	33	#include <iprt/win/shlobj.h>
34	34
35	35	#include <iprt/path.h>

Note: See TracChangeset for help on using the changeset viewer.

Download in other formats:

© 2025 Oracle Support Privacy / Do Not Sell My Info Terms of Use Trademark Policy Automated Access Etiquette