gnustep/libs-back
0
0
Fork 0
mirror of https://github.com/gnustep/libs-back.git synced 2025-02-23 11:51:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add version check in debug for Shell32.dll

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/back/branches/gnustep_testplant_branch@39792 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Marcian Lytwyn 2016-05-19 17:01:45 +00:00
parent 39e7d68833
commit d7a2a650bb
1 changed files with 40 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
Source/win32/MSUserNotifications/TaskbarNotifications/TaskbarNotifications.mm
View file

@ -77,10 +77,11 @@ void _removeApplicationIcon(DWORD, HICON);
void _removeProcessInfo(); void _removeProcessInfo();
void _removeApplicationIconForID(UINT appIconID); void _removeApplicationIconForID(UINT appIconID);
static HANDLE gHandleDLL = NULL; static HANDLE gHandleDLL = NULL;
static HWND gHandleWin = NULL; static HWND gHandleWin = NULL;
static UINT gNotifyMsg = 0; static UINT gNotifyMsg = 0;
static UINT gNotifyCnt = 0; static UINT gNotifyCnt = 0;
static DLLVERSIONINFO gShell32DllVersion = { 0 };
// Objective-C/GNUstep references... // Objective-C/GNUstep references...
static NSString *gUuidString = nil; static NSString *gUuidString = nil;
@ -162,6 +163,40 @@ void _initWin32Context()
// Register our message window type...... // Register our message window type......
_registerWindowsClass(); _registerWindowsClass();
#if defined(DEBUG)
// Get Shell32 DLL version information...
HMODULE hShell32Dll = LoadLibrary(TEXT("Shell32.dll"));
if (hShell32Dll == NULL)
{
NSLog(@"%s:unable to load library Shell32.dll - error: %d", __PRETTY_FUNCTION__, GetLastError());
}
else
{
DLLGETVERSIONPROC procaddr = (DLLGETVERSIONPROC)GetProcAddress(hShell32Dll, TEXT("DllGetVersion"));
if (procaddr == NULL)
{
NSLog(@"%s:Shell32.dll version info function 'DllGetVersion' missing", __PRETTY_FUNCTION__);
}
else
{
// Setup the size parameter for the structure...
gShell32DllVersion.cbSize = sizeof(gShell32DllVersion);
// Get the version information...
procaddr(&gShell32DllVersion);
NSLog(@"%s:Shell32.dll version info - major: %d minor: %d build: %d platform %d", __PRETTY_FUNCTION__,
gShell32DllVersion.dwMajorVersion,
gShell32DllVersion.dwMinorVersion,
gShell32DllVersion.dwBuildNumber,
gShell32DllVersion.dwPlatformID);
}
#endif
// cleanup...
FreeLibrary(hShell32Dll);
}
// Register the windows notify message we want... // Register the windows notify message we want...
gNotifyMsg = RegisterWindowMessage(NOTIFY_MESSAGE_NAME); gNotifyMsg = RegisterWindowMessage(NOTIFY_MESSAGE_NAME);
if (gNotifyMsg == 0) if (gNotifyMsg == 0)
@ -844,6 +879,7 @@ EXPORT BOOL __cdecl removeNotification(HICON icon, REMOVE_NOTE_INFO_T *noteinfo)
NSLog(@"%s:%d:ID %d", __PRETTY_FUNCTION__, __LINE__, noteinfo->uniqueID); NSLog(@"%s:%d:ID %d", __PRETTY_FUNCTION__, __LINE__, noteinfo->uniqueID);
_setupNotifyData(notifyData); _setupNotifyData(notifyData);
//s_setupNotifyDataTextInfo(notifyData, "", "");
notifyData.uID = _addApplicationIcon(GetCurrentProcessId(), NULL, icon); notifyData.uID = _addApplicationIcon(GetCurrentProcessId(), NULL, icon);
// Show the notification. // Show the notification.