Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add additional check for WhatsApp (Outdated) window title to work wit… #159

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+23 −10
Open

Add additional check for WhatsApp (Outdated) window title to work wit… #159

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 11 additions & 5 deletions WhatsappTray/Hook.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,6 +159,12 @@ DWORD WINAPI Init(LPVOID lpParam)
}

_whatsAppWindowHandle = GetTopLevelWindowhandleWithName(WHATSAPP_CLIENT_NAME);
if(_whatsAppWindowHandle == nullptr)
{
LogString("WhatsApp window not found, checking for outdated version");
_whatsAppWindowHandle = GetTopLevelWindowhandleWithName(WHATSAPP_OUTDATED_CLIENT_NAME);
}

auto windowTitle = GetWindowTitle(_whatsAppWindowHandle);

LogString("Attached in window '%s' _whatsAppWindowHandle: 0x%08X", windowTitle.c_str(), _whatsAppWindowHandle);
Expand Down Expand Up @@ -437,11 +443,11 @@ LRESULT CALLBACK CallWndRetProc(int nCode, WPARAM wParam, LPARAM lParam)
*/
static HWND GetTopLevelWindowhandleWithName(std::string searchedWindowTitle)
{
HWND iteratedHwnd = NULL;
HWND iteratedHwnd = nullptr;
while (true) {
iteratedHwnd = FindWindowExA(NULL, iteratedHwnd, NULL, WHATSAPP_CLIENT_NAME);
if (iteratedHwnd == NULL) {
return NULL;
iteratedHwnd = FindWindowExA(nullptr, iteratedHwnd, nullptr, searchedWindowTitle.c_str());
if (iteratedHwnd == nullptr) {
return nullptr;
}

DWORD processId;
Expand All @@ -462,7 +468,7 @@ static HWND GetTopLevelWindowhandleWithName(std::string searchedWindowTitle)

auto windowTitle = GetWindowTitle(iteratedHwnd);
// Also check length because compare also matches strings that are longer like 'WhatsApp Voip'
if (windowTitle.compare(searchedWindowTitle) != 0 || windowTitle.length() != strlen(WHATSAPP_CLIENT_NAME)) {
if (windowTitle.compare(searchedWindowTitle) != 0 || windowTitle.length() != searchedWindowTitle.length()) {
//LogString("windowTitle='" + windowTitle + "' does not match '" WHATSAPP_CLIENT_NAME "'");
continue;
}
Expand Down
1 change: 1 addition & 0 deletions WhatsappTray/SharedDefines.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@

#define NAME TEXT("WhatsappTray")
#define WHATSAPP_CLIENT_NAME TEXT("WhatsApp")
#define WHATSAPP_OUTDATED_CLIENT_NAME TEXT("WhatsApp (Outdated)")
#define WHATSAPPTRAY_LOAD_LIBRARY_TEST_ENV_VAR "WhatsappTrayLoadLibraryTest" /* The enviroment-variable used to test if the hook.dll was triggerd by WhatsappTray's LoadLibrary() */
#define WHATSAPPTRAY_LOAD_LIBRARY_TEST_ENV_VAR_VALUE "TRUE" /* The value of the enviroment-variable used to test if the hook.dll was triggerd by WhatsappTray's LoadLibrary() */

Expand Down
16 changes: 11 additions & 5 deletions WhatsappTray/WhatsappTray.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -389,11 +389,16 @@ static HWND StartWhatsapp()
*/
static HWND FindWhatsappWindowHandle()
{
HWND iteratedHwnd = NULL;
HWND iteratedHwnd = nullptr;
bool outdated = false;
while (true) {
iteratedHwnd = FindWindowExA(NULL, iteratedHwnd, NULL, WHATSAPP_CLIENT_NAME);
if (iteratedHwnd == NULL) {
return NULL;
iteratedHwnd = FindWindowExA(nullptr, iteratedHwnd, nullptr, WHATSAPP_CLIENT_NAME);
if (iteratedHwnd == nullptr) {
outdated = true;
iteratedHwnd = FindWindowExA(nullptr, iteratedHwnd, nullptr, WHATSAPP_OUTDATED_CLIENT_NAME);
if (iteratedHwnd == nullptr) {
return nullptr;
}
}

auto windowTitle = Helper::GetWindowTitle(iteratedHwnd);
Expand All @@ -408,7 +413,8 @@ static HWND FindWhatsappWindowHandle()
}

// Also check length because compare also matches strings that are longer like 'WhatsApp Voip'. Not sure if that is true but i leave it for now...
if (windowTitle.compare(WHATSAPP_CLIENT_NAME) != 0 && windowTitle.length() == strlen(WHATSAPP_CLIENT_NAME)) {
if (windowTitle.compare(outdated ? WHATSAPP_OUTDATED_CLIENT_NAME : WHATSAPP_CLIENT_NAME) != 0 &&
windowTitle.length() == strlen(outdated ? WHATSAPP_OUTDATED_CLIENT_NAME : WHATSAPP_CLIENT_NAME)) {
LogInfo("Window name does not match");
continue;
}
Expand Down