From f3151f33e282214080abacf04521296acec5e9de Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
Date: Mon, 7 Dec 2015 16:15:24 +0000
Subject: fix to apply the unique identifiers to all menu roots

git-svn-id: http://svn.miranda-ng.org/main/trunk@15826 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
 src/mir_app/src/menu_utils.cpp | 10 ++++++++++
 1 file changed, 10 insertions(+)

(limited to 'src/mir_app')

diff --git a/src/mir_app/src/menu_utils.cpp b/src/mir_app/src/menu_utils.cpp
index b3430d527f..884f6c7816 100644
--- a/src/mir_app/src/menu_utils.cpp
+++ b/src/mir_app/src/menu_utils.cpp
@@ -458,6 +458,8 @@ MIR_APP_DLL(BOOL) Menu_ProcessCommand(HGENMENU hMenuItem, LPARAM lParam)
 
 /////////////////////////////////////////////////////////////////////////////////////////
 
+#pragma comment(lib, "Rpcrt4.lib")
+
 MIR_APP_DLL(int) Menu_ConfigureItem(HGENMENU hItem, int iOption, INT_PTR value)
 {
 	if (!bIsGenMenuInited)
@@ -480,6 +482,10 @@ MIR_APP_DLL(int) Menu_ConfigureItem(HGENMENU hItem, int iOption, INT_PTR value)
 	case MCI_OPT_EXECPARAM:
 		pimi->execParam = value;
 		return 0;
+
+	case MCI_OPT_UID:
+		UuidFromStringA((RPC_CSTR)value, (UUID*)&pimi->mi.uid);
+		return 0;
 	}
 
 	return 1;
@@ -733,6 +739,10 @@ MIR_APP_DLL(HGENMENU) Menu_AddItem(int hMenuObject, TMO_MenuItem *pmi, void *pUs
 		
 		// if parent menu has no uid, copy our id instead
 		if (!equalUUID(pmi->uid, miid_last) && equalUUID(pRoot->mi.uid, miid_last)) {
+			char szUid[100];
+			bin2hex(&pmi->uid, sizeof(pmi->uid), szUid);
+			Netlib_Logf("[MENU]: fake UUID added to menu item %s", szUid);
+
 			pRoot->mi.uid = pmi->uid;
 			pRoot->mi.uid.d[7]--; // and make it slightly different
 		}
-- 
cgit v1.2.3