Changeset 46625 in vbox
- Timestamp:
- Jun 18, 2013 1:28:52 PM (11 years ago)
- Location:
- trunk/src/VBox
- Files:
-
- 10 edited
-
Additions/WINNT/VBoxTray/VBoxDispIf.cpp (modified) (4 diffs)
-
Additions/WINNT/VBoxTray/VBoxDisplay.cpp (modified) (1 diff)
-
Additions/WINNT/VBoxTray/VBoxLA.cpp (modified) (1 diff)
-
Additions/WINNT/VBoxTray/VBoxTray.cpp (modified) (4 diffs)
-
Additions/common/VBoxControl/VBoxControl.cpp (modified) (1 diff)
-
Additions/common/VBoxService/VBoxServiceStats.cpp (modified) (2 diffs)
-
Devices/Storage/DrvHostBase.cpp (modified) (1 diff)
-
Runtime/r3/win/RTSystemQueryOSInfo-win.cpp (modified) (1 diff)
-
Runtime/r3/win/mp-win.cpp (modified) (1 diff)
-
Runtime/r3/win/thread-win.cpp (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/VBox/Additions/WINNT/VBoxTray/VBoxDispIf.cpp
r46194 r46625 100 100 { 101 101 Log((__FUNCTION__": this is vista and up\n")); 102 HMODULE hUser = GetModuleHandle(" USER32");102 HMODULE hUser = GetModuleHandle("user32.dll"); 103 103 if (hUser) 104 104 { … … 169 169 else 170 170 { 171 Log((__FUNCTION__": GetModuleHandle( USER32) failed, err(%d)\n", GetLastError()));171 Log((__FUNCTION__": GetModuleHandle(user32) failed, err(%d)\n", GetLastError())); 172 172 err = ERROR_NOT_SUPPORTED; 173 173 } … … 1573 1573 if (OSinfo.dwMajorVersion >= 5) 1574 1574 { 1575 HMODULE hUser = GetModuleHandle(" USER32");1575 HMODULE hUser = GetModuleHandle("user32.dll"); 1576 1576 if (NULL != hUser) 1577 1577 { … … 1589 1589 else 1590 1590 { 1591 Log((__FUNCTION__": failed to get USER32 handle, err (%d)\n", GetLastError()));1591 Log((__FUNCTION__": failed to get user32 handle, err (%d)\n", GetLastError())); 1592 1592 err = ERROR_NOT_SUPPORTED; 1593 1593 } -
trunk/src/VBox/Additions/WINNT/VBoxTray/VBoxDisplay.cpp
r45761 r46625 63 63 GetVersionEx (&OSinfo); 64 64 65 HMODULE hUser = GetModuleHandle(" USER32");65 HMODULE hUser = GetModuleHandle("user32.dll"); 66 66 67 67 gCtx.pEnv = pEnv; -
trunk/src/VBox/Additions/WINNT/VBoxTray/VBoxLA.cpp
r46593 r46625 1249 1249 RT_ZERO(gCtx.activeClient); 1250 1250 1251 *(void **)&gCtx.pfnProcessIdToSessionId = RTLdrGetSystemSymbol(" KERNEL32", "ProcessIdToSessionId");1251 *(void **)&gCtx.pfnProcessIdToSessionId = RTLdrGetSystemSymbol("kernel32.dll", "ProcessIdToSessionId"); 1252 1252 *pfStartThread = true; 1253 1253 *ppInstance = &gCtx; -
trunk/src/VBox/Additions/WINNT/VBoxTray/VBoxTray.cpp
r46593 r46625 551 551 BOOL (WINAPI * pfnConvertStringSecurityDescriptorToSecurityDescriptorA)(LPCSTR StringSecurityDescriptor, DWORD StringSDRevision, PSECURITY_DESCRIPTOR *SecurityDescriptor, PULONG SecurityDescriptorSize); 552 552 *(void **)&pfnConvertStringSecurityDescriptorToSecurityDescriptorA = 553 RTLdrGetSystemSymbol(" ADVAPI32.DLL", "ConvertStringSecurityDescriptorToSecurityDescriptorA");553 RTLdrGetSystemSymbol("advapi32.dll", "ConvertStringSecurityDescriptorToSecurityDescriptorA"); 554 554 Log(("VBoxTray: pfnConvertStringSecurityDescriptorToSecurityDescriptorA = %x\n", pfnConvertStringSecurityDescriptorToSecurityDescriptorA)); 555 555 if (pfnConvertStringSecurityDescriptorToSecurityDescriptorA) … … 1292 1292 { 1293 1293 /* Try get the system APIs we need. */ 1294 *(void **)&gVBoxDt.pfnGetThreadDesktop = RTLdrGetSystemSymbol(" User32.dll", "GetThreadDesktop");1294 *(void **)&gVBoxDt.pfnGetThreadDesktop = RTLdrGetSystemSymbol("user32.dll", "GetThreadDesktop"); 1295 1295 if (!gVBoxDt.pfnGetThreadDesktop) 1296 1296 { … … 1299 1299 } 1300 1300 1301 *(void **)&gVBoxDt.pfnOpenInputDesktop = RTLdrGetSystemSymbol(" User32.dll", "OpenInputDesktop");1301 *(void **)&gVBoxDt.pfnOpenInputDesktop = RTLdrGetSystemSymbol("user32.dll", "OpenInputDesktop"); 1302 1302 if (!gVBoxDt.pfnOpenInputDesktop) 1303 1303 { … … 1306 1306 } 1307 1307 1308 *(void **)&gVBoxDt.pfnCloseDesktop = RTLdrGetSystemSymbol(" User32.dll", "CloseDesktop");1308 *(void **)&gVBoxDt.pfnCloseDesktop = RTLdrGetSystemSymbol("user32.dll", "CloseDesktop"); 1309 1309 if (!gVBoxDt.pfnCloseDesktop) 1310 1310 { -
trunk/src/VBox/Additions/common/VBoxControl/VBoxControl.cpp
r44992 r46625 582 582 } 583 583 584 HMODULE hUser = GetModuleHandle(" USER32");584 HMODULE hUser = GetModuleHandle("user32.dll"); 585 585 586 586 if (hUser) -
trunk/src/VBox/Additions/common/VBoxService/VBoxServiceStats.cpp
r46593 r46625 127 127 /* NtQuerySystemInformation might be dropped in future releases, so load 128 128 it dynamically as per Microsoft's recommendation. */ 129 *(void **)&gCtx.pfnNtQuerySystemInformation = RTLdrGetSystemSymbol(" NTDLL.DLL", "NtQuerySystemInformation");129 *(void **)&gCtx.pfnNtQuerySystemInformation = RTLdrGetSystemSymbol("ntdll.dll", "NtQuerySystemInformation"); 130 130 if (gCtx.pfnNtQuerySystemInformation) 131 131 VBoxServiceVerbose(3, "VBoxStatsInit: gCtx.pfnNtQuerySystemInformation = %x\n", gCtx.pfnNtQuerySystemInformation); 132 132 else 133 133 { 134 VBoxServiceVerbose(3, "VBoxStatsInit: NTDLL.NtQuerySystemInformation not found!\n");134 VBoxServiceVerbose(3, "VBoxStatsInit: ntdll.NtQuerySystemInformation not found!\n"); 135 135 return VERR_SERVICE_DISABLED; 136 136 } 137 137 138 138 /* GlobalMemoryStatus is win2k and up, so load it dynamically */ 139 *(void **)&gCtx.pfnGlobalMemoryStatusEx = RTLdrGetSystemSymbol(" KERNEL32.DLL", "GlobalMemoryStatusEx");139 *(void **)&gCtx.pfnGlobalMemoryStatusEx = RTLdrGetSystemSymbol("kernel32.dll", "GlobalMemoryStatusEx"); 140 140 if (gCtx.pfnGlobalMemoryStatusEx) 141 141 VBoxServiceVerbose(3, "VBoxStatsInit: gCtx.GlobalMemoryStatusEx = %x\n", gCtx.pfnGlobalMemoryStatusEx); … … 143 143 { 144 144 /** @todo Now fails in NT4; do we care? */ 145 VBoxServiceVerbose(3, "VBoxStatsInit: KERNEL32.GlobalMemoryStatusEx not found!\n");145 VBoxServiceVerbose(3, "VBoxStatsInit: kernel32.GlobalMemoryStatusEx not found!\n"); 146 146 return VERR_SERVICE_DISABLED; 147 147 } 148 148 149 149 /* GetPerformanceInfo is xp and up, so load it dynamically */ 150 *(void **)&gCtx.pfnGetPerformanceInfo = RTLdrGetSystemSymbol(" PSAPI.DLL", "GetPerformanceInfo");150 *(void **)&gCtx.pfnGetPerformanceInfo = RTLdrGetSystemSymbol("psapi.dll", "GetPerformanceInfo"); 151 151 if (gCtx.pfnGetPerformanceInfo) 152 152 VBoxServiceVerbose(3, "VBoxStatsInit: gCtx.pfnGetPerformanceInfo= %x\n", gCtx.pfnGetPerformanceInfo); -
trunk/src/VBox/Devices/Storage/DrvHostBase.cpp
r45061 r46625 1561 1561 s_classDeviceChange.lpfnWndProc = DeviceChangeWindowProc; 1562 1562 s_classDeviceChange.lpszClassName = "VBOX_DeviceChangeClass"; 1563 s_classDeviceChange.hInstance = GetModuleHandle("VB OXDD.DLL");1563 s_classDeviceChange.hInstance = GetModuleHandle("VBoxDD.dll"); 1564 1564 Assert(s_classDeviceChange.hInstance); 1565 1565 s_hAtomDeviceChange = RegisterClassA(&s_classDeviceChange); -
trunk/src/VBox/Runtime/r3/win/RTSystemQueryOSInfo-win.cpp
r44529 r46625 225 225 { 226 226 BOOL (WINAPI *pfnGetProductInfo)(DWORD, DWORD, DWORD, DWORD, PDWORD); 227 pfnGetProductInfo = (BOOL (WINAPI *)(DWORD, DWORD, DWORD, DWORD, PDWORD))GetProcAddress(GetModuleHandle(" KERNEL32.DLL"), "GetProductInfo");227 pfnGetProductInfo = (BOOL (WINAPI *)(DWORD, DWORD, DWORD, DWORD, PDWORD))GetProcAddress(GetModuleHandle("kernel32.dll"), "GetProductInfo"); 228 228 if (pfnGetProductInfo) 229 229 { -
trunk/src/VBox/Runtime/r3/win/mp-win.cpp
r46619 r46625 97 97 98 98 pfnGetLogicalProcInfo = (BOOL (WINAPI *)(PSYSTEM_LOGICAL_PROCESSOR_INFORMATION, PDWORD)) 99 GetProcAddress(GetModuleHandle(" KERNEL32.DLL"), "GetLogicalProcessorInformation");99 GetProcAddress(GetModuleHandle("kernel32.dll"), "GetLogicalProcessorInformation"); 100 100 /* 0 represents an error condition. We cannot return VERR* error codes as caller expects a 101 101 * unsigned value of core count.*/ -
trunk/src/VBox/Runtime/r3/win/thread-win.cpp
r46593 r46625 174 174 cComInits, cComInits, cOleInits, cOleInits)); 175 175 176 HMODULE hOle32 = GetModuleHandle(" OLE32");176 HMODULE hOle32 = GetModuleHandle("ole32.dll"); 177 177 AssertReturnVoid(hOle32 != NULL); 178 178 … … 258 258 if (!fInitialized) 259 259 { 260 HMODULE hmodKernel32 = GetModuleHandle(" KERNEL32.DLL");260 HMODULE hmodKernel32 = GetModuleHandle("kernel32.dll"); 261 261 if (hmodKernel32) 262 262 pfnGetCurrentProcessorNumber = (DWORD (WINAPI*)(void))GetProcAddress(hmodKernel32, "GetCurrentProcessorNumber");
Note:
See TracChangeset
for help on using the changeset viewer.

