[2/9] cryptui: Use "-1" as a "don't care value", fix dialog id duplicates. Take 2.

[Dmitry Timoshkov]

---
 dlls/cryptui/cryptui_En.rc |   18 +++++++++---------
 dlls/cryptui/cryptuires.h  |    1 -
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/dlls/cryptui/cryptui_En.rc b/dlls/cryptui/cryptui_En.rc
index 119eac6..5fa54ff 100644
--- a/dlls/cryptui/cryptui_En.rc
+++ b/dlls/cryptui/cryptui_En.rc
@@ -148,15 +148,15 @@ CAPTION "General"
 STYLE WS_VISIBLE
 FONT 8, "MS Shell Dlg"
 BEGIN
-  CONTROL "", IDC_STATIC, "Static", WS_BORDER|SS_WHITERECT, 6,10,241,200
+  CONTROL "", -1, "Static", WS_BORDER|SS_WHITERECT, 6,10,241,200
   CONTROL "", IDC_CERTIFICATE_ICON,"RichEdit20W",
     ES_READONLY|WS_DISABLED,8,11,26,26
   CONTROL "", IDC_CERTIFICATE_INFO,"RichEdit20W",
     ES_READONLY|WS_DISABLED,34,11,212,26
-  CONTROL "", IDC_STATIC, "Static", SS_BLACKFRAME, 16,37,222,1
+  CONTROL "", -1, "Static", SS_BLACKFRAME, 16,37,222,1
   CONTROL "", IDC_CERTIFICATE_STATUS,"RichEdit20W",
     ES_READONLY|ES_MULTILINE,8,38,238,78
-  CONTROL "", IDC_STATIC, "Static", SS_BLACKFRAME, 16,116,222,1
+  CONTROL "", -1, "Static", SS_BLACKFRAME, 16,116,222,1
   CONTROL "", IDC_CERTIFICATE_NAMES,"RichEdit20W",
     ES_READONLY|ES_MULTILINE|WS_DISABLED,8,118,238,90
   PUSHBUTTON "&Install Certificate...", IDC_ADDTOSTORE,103,216,70,14
@@ -274,11 +274,11 @@ BEGIN
   PUSHBUTTON "B&rowse...", IDC_IMPORT_BROWSE_FILE, 236,11,60,14
   LTEXT "Note:  The following file formats may contain more than one certificate, certificate revocation list, or certificate trust list:", stc2, 21,26,265,16
   LTEXT "Cryptographic Message Syntax Standard/PKCS #7 Messages (.p7b)",
-    stc3, 31,49,265,10
+    -1, 31,49,265,10
   LTEXT "Personal Information Exchange/PKCS #12 (.pfx, .p12)",
-    stc3, 31,64,265,10
+    -1, 31,64,265,10
   LTEXT "Microsoft Serialized Certificate Store (.sst)",
-    stc3, 31,79,265,10
+    -1, 31,79,265,10
 END
 
 IDD_IMPORT_STORE DIALOG DISCARDABLE 0,0,317,143
@@ -313,7 +313,7 @@ IDD_CERT_MGR DIALOG DISCARDABLE 0,0,335,270
 CAPTION "Certificates"
 FONT 8, "MS Shell Dlg"
 BEGIN
-  LTEXT "I&ntended purpose:", IDC_STATIC, 7,9,100,12
+  LTEXT "I&ntended purpose:", -1, 7,9,100,12
   COMBOBOX IDC_MGR_PURPOSE_SELECTION, 83,7,245,14,
     CBS_DROPDOWNLIST|WS_BORDER|WS_VSCROLL|WS_TABSTOP
   CONTROL "", IDC_MGR_STORES, "SysTabControl32",
@@ -336,8 +336,8 @@ FONT 8, "MS Shell Dlg"
 BEGIN
   GROUPBOX "Certificate purpose", grp1, 7,7,234,141, BS_GROUPBOX
   LTEXT "Select one or more purposes to be listed when Advanced Purposes is selected.",
-    IDC_STATIC, 14,18,220,16
-  LTEXT "&Certificate purposes:", IDC_STATIC, 14,41,90,12, WS_TABSTOP
+    -1, 14,18,220,16
+  LTEXT "&Certificate purposes:", -1, 14,41,90,12, WS_TABSTOP
   CONTROL "", IDC_CERTIFICATE_USAGES,"SysListView32",
     LVS_REPORT|LVS_NOCOLUMNHEADER|LVS_SINGLESEL|WS_CHILD|WS_VISIBLE|WS_TABSTOP|WS_BORDER,
     14,51,220,90
diff --git a/dlls/cryptui/cryptuires.h b/dlls/cryptui/cryptuires.h
index 4f2cc7f..e4ab58f 100644
--- a/dlls/cryptui/cryptuires.h
+++ b/dlls/cryptui/cryptuires.h
@@ -162,7 +162,6 @@
 #define IDB_CERT_WATERMARK 205
 #define IDB_CERT_HEADER 206
 
-#define IDC_STATIC 2000
 #define IDC_CERTIFICATE_ICON 2001
 #define IDC_CERTIFICATE_INFO 2002
 #define IDC_CERTIFICATE_STATUS 2003
-- 
1.6.1