mshtml: Use "-1" as a "don't care value", fix dialog id duplicates.

dlls/mshtml/Da.rc

@@ -47,10 +47,10 @@ STYLE DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Hyperlink"
 FONT 8, "MS Shell Dlg"
 {
-    GROUPBOX "Information om Hyperlink'en", IDC_STATIC, 5, 5, 190, 55
-    LTEXT "&Type:", IDC_STATIC, 10, 22, 20, 10
+    GROUPBOX "Information om Hyperlink'en", -1, 5, 5, 190, 55
+    LTEXT "&Type:", -1, 10, 22, 20, 10
     COMBOBOX IDC_TYPE, 35, 20, 45, 100, WS_TABSTOP | WS_GROUP | WS_VSCROLL | CBS_DROPDOWNLIST | CBS_HASSTRINGS
-    LTEXT "&URL:", IDC_STATIC, 10, 42, 20, 10
+    LTEXT "&URL:", -1, 10, 42, 20, 10
     EDITTEXT IDC_URL, 35, 40, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP
     PUSHBUTTON "OK", IDOK, 200, 10, 45, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
     PUSHBUTTON "Annuller", IDCANCEL, 200, 28, 45, 14, WS_GROUP | WS_TABSTOP

dlls/mshtml/De.rc

@@ -48,10 +48,10 @@ STYLE DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Hyperlink"
 FONT 8, "MS Shell Dlg"
 {
-    GROUPBOX "Hyperlink Informationen", IDC_STATIC, 5, 5, 190, 55
-    LTEXT "&Typ:", IDC_STATIC, 10, 22, 20, 10
+    GROUPBOX "Hyperlink Informationen", -1, 5, 5, 190, 55
+    LTEXT "&Typ:", -1, 10, 22, 20, 10
     COMBOBOX IDC_TYPE, 35, 20, 45, 100, WS_TABSTOP | WS_GROUP | WS_VSCROLL | CBS_DROPDOWNLIST | CBS_HASSTRINGS
-    LTEXT "&URL:", IDC_STATIC, 10, 42, 20, 10
+    LTEXT "&URL:", -1, 10, 42, 20, 10
     EDITTEXT IDC_URL, 35, 40, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP
     PUSHBUTTON "OK", IDOK, 200, 10, 45, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
     PUSHBUTTON "Abbrechen", IDCANCEL, 200, 28, 45, 14, WS_GROUP | WS_TABSTOP

dlls/mshtml/En.rc

@@ -45,10 +45,10 @@ STYLE DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Hyperlink"
 FONT 8, "MS Shell Dlg"
 {
-    GROUPBOX "Hyperlink Information", IDC_STATIC, 5, 5, 190, 55
-    LTEXT "&Type:", IDC_STATIC, 10, 22, 20, 10
+    GROUPBOX "Hyperlink Information", -1, 5, 5, 190, 55
+    LTEXT "&Type:", -1, 10, 22, 20, 10
     COMBOBOX IDC_TYPE, 35, 20, 45, 100, WS_TABSTOP | WS_GROUP | WS_VSCROLL | CBS_DROPDOWNLIST | CBS_HASSTRINGS
-    LTEXT "&URL:", IDC_STATIC, 10, 42, 20, 10
+    LTEXT "&URL:", -1, 10, 42, 20, 10
     EDITTEXT IDC_URL, 35, 40, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP
     PUSHBUTTON "OK", IDOK, 200, 10, 45, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
     PUSHBUTTON "Cancel", IDCANCEL, 200, 28, 45, 14, WS_GROUP | WS_TABSTOP

dlls/mshtml/Es.rc

@@ -47,10 +47,10 @@ STYLE DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Enlace"
 FONT 8, "MS Shell Dlg"
 {
-    GROUPBOX "Informacin sobre el enlace", IDC_STATIC, 5, 5, 190, 55
-    LTEXT "&Tipo:", IDC_STATIC, 10, 22, 20, 10
+    GROUPBOX "Informacin sobre el enlace", -1, 5, 5, 190, 55
+    LTEXT "&Tipo:", -1, 10, 22, 20, 10
     COMBOBOX IDC_TYPE, 35, 20, 45, 100, WS_TABSTOP | WS_GROUP | WS_VSCROLL | CBS_DROPDOWNLIST | CBS_HASSTRINGS
-    LTEXT "&URL:", IDC_STATIC, 10, 42, 20, 10
+    LTEXT "&URL:", -1, 10, 42, 20, 10
     EDITTEXT IDC_URL, 35, 40, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP
     PUSHBUTTON "Aceptar", IDOK, 200, 10, 45, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
     PUSHBUTTON "Anular", IDCANCEL, 200, 28, 45, 14, WS_GROUP | WS_TABSTOP

dlls/mshtml/Fr.rc

@@ -48,10 +48,10 @@ STYLE DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Hyperlien"
 FONT 8, "MS Shell Dlg"
 {
-    GROUPBOX "Informations sur l'hyperlien", IDC_STATIC, 5, 5, 190, 55
-    LTEXT "&Type:", IDC_STATIC, 10, 22, 20, 10
+    GROUPBOX "Informations sur l'hyperlien", -1, 5, 5, 190, 55
+    LTEXT "&Type:", -1, 10, 22, 20, 10
     COMBOBOX IDC_TYPE, 35, 20, 45, 100, WS_TABSTOP | WS_GROUP | WS_VSCROLL | CBS_DROPDOWNLIST | CBS_HASSTRINGS
-    LTEXT "&URL:", IDC_STATIC, 10, 42, 20, 10
+    LTEXT "&URL:", -1, 10, 42, 20, 10
     EDITTEXT IDC_URL, 35, 40, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP
     PUSHBUTTON "OK", IDOK, 200, 10, 45, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
     PUSHBUTTON "Annuler", IDCANCEL, 200, 28, 45, 14, WS_GROUP | WS_TABSTOP

dlls/mshtml/Ja.rc

@@ -47,10 +47,10 @@ STYLE DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "ハイパーリンク"
 FONT 9, "MS Shell Dlg"
 {
-    GROUPBOX "ハイパーリンクの情報", IDC_STATIC, 5, 5, 190, 55
-    LTEXT "種類(&T):", IDC_STATIC, 10, 22, 20, 10
+    GROUPBOX "ハイパーリンクの情報", -1, 5, 5, 190, 55
+    LTEXT "種類(&T):", -1, 10, 22, 20, 10
     COMBOBOX IDC_TYPE, 35, 20, 45, 100, WS_TABSTOP | WS_GROUP | WS_VSCROLL | CBS_DROPDOWNLIST | CBS_HASSTRINGS
-    LTEXT "&URL:", IDC_STATIC, 10, 42, 20, 10
+    LTEXT "&URL:", -1, 10, 42, 20, 10
     EDITTEXT IDC_URL, 35, 40, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP
     PUSHBUTTON "OK", IDOK, 200, 10, 45, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
     PUSHBUTTON "キャンセル", IDCANCEL, 200, 28, 45, 14, WS_GROUP | WS_TABSTOP

dlls/mshtml/Ko.rc

@@ -46,10 +46,10 @@ STYLE DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "하이퍼링크"
 FONT 9, "MS Shell Dlg"
 {
-	GROUPBOX "하이퍼링크 정보", IDC_STATIC, 5, 5, 190, 55
-	LTEXT "형식(&T):", IDC_STATIC, 10, 22, 24, 10
+	GROUPBOX "하이퍼링크 정보", -1, 5, 5, 190, 55
+	LTEXT "형식(&T):", -1, 10, 22, 24, 10
 	COMBOBOX IDC_TYPE, 35, 20, 45, 100, WS_TABSTOP | WS_GROUP | WS_VSCROLL | CBS_DROPDOWNLIST | 	CBS_HASSTRINGS
-	LTEXT "주소(&U):", IDC_STATIC, 10, 42, 24, 10
+	LTEXT "주소(&U):", -1, 10, 42, 24, 10
 	EDITTEXT IDC_URL, 35, 40, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP
 	PUSHBUTTON "확인", IDOK, 200, 10, 45, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
 	PUSHBUTTON "취소", IDCANCEL, 200, 28, 45, 14, WS_GROUP | WS_TABSTOP

dlls/mshtml/Nl.rc

@@ -48,10 +48,10 @@ STYLE DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Webverwijzing"
 FONT 8, "MS Shell Dlg"
 {
-    GROUPBOX "Webverwijzing Informatie", IDC_STATIC, 5, 5, 190, 55
-    LTEXT "&Type:", IDC_STATIC, 10, 22, 20, 10
+    GROUPBOX "Webverwijzing Informatie", -1, 5, 5, 190, 55
+    LTEXT "&Type:", -1, 10, 22, 20, 10
     COMBOBOX IDC_TYPE, 35, 20, 45, 100, WS_TABSTOP | WS_GROUP | WS_VSCROLL | CBS_DROPDOWNLIST | CBS_HASSTRINGS
-    LTEXT "&URL:", IDC_STATIC, 10, 42, 20, 10
+    LTEXT "&URL:", -1, 10, 42, 20, 10
     EDITTEXT IDC_URL, 35, 40, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP
     PUSHBUTTON "OK", IDOK, 200, 10, 45, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
     PUSHBUTTON "Annuleren", IDCANCEL, 200, 28, 45, 14, WS_GROUP | WS_TABSTOP

dlls/mshtml/No.rc

@@ -47,10 +47,10 @@ STYLE DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Hyperkobling"
 FONT 8, "MS Shell Dlg"
 {
-    GROUPBOX "Informasjon om koblingen", IDC_STATIC, 5, 5, 190, 55
-    LTEXT "&Type:", IDC_STATIC, 10, 22, 20, 10
+    GROUPBOX "Informasjon om koblingen", -1, 5, 5, 190, 55
+    LTEXT "&Type:", -1, 10, 22, 20, 10
     COMBOBOX IDC_TYPE, 35, 20, 45, 100, WS_TABSTOP | WS_GROUP | WS_VSCROLL | CBS_DROPDOWNLIST | CBS_HASSTRINGS
-    LTEXT "&URL:", IDC_STATIC, 10, 42, 20, 10
+    LTEXT "&URL:", -1, 10, 42, 20, 10
     EDITTEXT IDC_URL, 35, 40, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP
     PUSHBUTTON "OK", IDOK, 200, 10, 45, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
     PUSHBUTTON "Avbryt", IDCANCEL, 200, 28, 45, 14, WS_GROUP | WS_TABSTOP

dlls/mshtml/Pl.rc

@@ -46,10 +46,10 @@ STYLE DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Hipercze"
 FONT 8, "MS Shell Dlg"
 {
-    GROUPBOX "Wasnoci hipercza", IDC_STATIC, 5, 5, 190, 55
-    LTEXT "&Typ:", IDC_STATIC, 10, 22, 20, 10
+    GROUPBOX "Wasnoci hipercza", -1, 5, 5, 190, 55
+    LTEXT "&Typ:", -1, 10, 22, 20, 10
     COMBOBOX IDC_TYPE, 35, 20, 45, 100, WS_TABSTOP | WS_GROUP | WS_VSCROLL | CBS_DROPDOWNLIST | CBS_HASSTRINGS
-    LTEXT "&URL:", IDC_STATIC, 10, 42, 20, 10
+    LTEXT "&URL:", -1, 10, 42, 20, 10
     EDITTEXT IDC_URL, 35, 40, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP
     PUSHBUTTON "OK", IDOK, 200, 10, 45, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
     PUSHBUTTON "Anuluj", IDCANCEL, 200, 28, 45, 14, WS_GROUP | WS_TABSTOP

dlls/mshtml/Pt.rc

@@ -45,10 +45,10 @@ STYLE DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Hiperligao"
 FONT 8, "MS Shell Dlg"
 {
-    GROUPBOX "Informao da Hiperligao", IDC_STATIC, 5, 5, 190, 55
-    LTEXT "&Tipo:", IDC_STATIC, 10, 22, 20, 10
+    GROUPBOX "Informao da Hiperligao", -1, 5, 5, 190, 55
+    LTEXT "&Tipo:", -1, 10, 22, 20, 10
     COMBOBOX IDC_TYPE, 35, 20, 45, 100, WS_TABSTOP | WS_GROUP | WS_VSCROLL | CBS_DROPDOWNLIST | CBS_HASSTRINGS
-    LTEXT "&URL:", IDC_STATIC, 10, 42, 20, 10
+    LTEXT "&URL:", -1, 10, 42, 20, 10
     EDITTEXT IDC_URL, 35, 40, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP
     PUSHBUTTON "OK", IDOK, 200, 10, 45, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
     PUSHBUTTON "Cancelar", IDCANCEL, 200, 28, 45, 14, WS_GROUP | WS_TABSTOP

dlls/mshtml/Ro.rc

@@ -46,10 +46,10 @@ STYLE DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Hiperlegătură"
 FONT 8, "MS Shell Dlg"
 {
-    GROUPBOX "Informații de hiperlegătură", IDC_STATIC, 5, 5, 190, 55
-    LTEXT "&Tip:", IDC_STATIC, 10, 22, 20, 10
+    GROUPBOX "Informații de hiperlegătură", -1, 5, 5, 190, 55
+    LTEXT "&Tip:", -1, 10, 22, 20, 10
     COMBOBOX IDC_TYPE, 35, 20, 45, 100, WS_TABSTOP | WS_GROUP | WS_VSCROLL | CBS_DROPDOWNLIST | CBS_HASSTRINGS
-    LTEXT "&URL:", IDC_STATIC, 10, 42, 20, 10
+    LTEXT "&URL:", -1, 10, 42, 20, 10
     EDITTEXT IDC_URL, 35, 40, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP
     PUSHBUTTON "OK", IDOK, 200, 10, 45, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
     PUSHBUTTON "Renunță", IDCANCEL, 200, 28, 45, 14, WS_GROUP | WS_TABSTOP

dlls/mshtml/Ru.rc

@@ -45,10 +45,10 @@ STYLE DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION ""
 FONT 8, "MS Shell Dlg"
 {
-    GROUPBOX "  ", IDC_STATIC, 5, 5, 190, 55
-    LTEXT "&:", IDC_STATIC, 10, 22, 20, 10
+    GROUPBOX "  ", -1, 5, 5, 190, 55
+    LTEXT "&:", -1, 10, 22, 20, 10
     COMBOBOX IDC_TYPE, 35, 20, 45, 100, WS_TABSTOP | WS_GROUP | WS_VSCROLL | CBS_DROPDOWNLIST | CBS_HASSTRINGS
-    LTEXT "&:", IDC_STATIC, 10, 42, 20, 10
+    LTEXT "&:", -1, 10, 42, 20, 10
     EDITTEXT IDC_URL, 35, 40, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP
     PUSHBUTTON "OK", IDOK, 200, 10, 45, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
     PUSHBUTTON "", IDCANCEL, 200, 28, 45, 14, WS_GROUP | WS_TABSTOP

dlls/mshtml/Si.rc

@@ -47,10 +47,10 @@ STYLE DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Hiperpovezava"
 FONT 8, "MS Shell Dlg"
 {
-    GROUPBOX "Lastnosti hiperpovezave", IDC_STATIC, 5, 5, 190, 55
-    LTEXT "&Vrsta:", IDC_STATIC, 10, 22, 20, 10
+    GROUPBOX "Lastnosti hiperpovezave", -1, 5, 5, 190, 55
+    LTEXT "&Vrsta:", -1, 10, 22, 20, 10
     COMBOBOX IDC_TYPE, 35, 20, 45, 100, WS_TABSTOP | WS_GROUP | WS_VSCROLL | CBS_DROPDOWNLIST | CBS_HASSTRINGS
-    LTEXT "&URL:", IDC_STATIC, 10, 42, 20, 10
+    LTEXT "&URL:", -1, 10, 42, 20, 10
     EDITTEXT IDC_URL, 35, 40, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP
     PUSHBUTTON "V redu", IDOK, 200, 10, 45, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
     PUSHBUTTON "Prekliči", IDCANCEL, 200, 28, 45, 14, WS_GROUP | WS_TABSTOP

dlls/mshtml/Sv.rc

@@ -46,10 +46,10 @@ STYLE DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Hyperlnk"
 FONT 8, "MS Shell Dlg"
 {
-    GROUPBOX "Lnkinformation", IDC_STATIC, 5, 5, 190, 55
-    LTEXT "&Typ:", IDC_STATIC, 10, 22, 20, 10
+    GROUPBOX "Lnkinformation", -1, 5, 5, 190, 55
+    LTEXT "&Typ:", -1, 10, 22, 20, 10
     COMBOBOX IDC_TYPE, 35, 20, 45, 100, WS_TABSTOP | WS_GROUP | WS_VSCROLL | CBS_DROPDOWNLIST | CBS_HASSTRINGS
-    LTEXT "&URL:", IDC_STATIC, 10, 42, 20, 10
+    LTEXT "&URL:", -1, 10, 42, 20, 10
     EDITTEXT IDC_URL, 35, 40, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP
     PUSHBUTTON "Ok", IDOK, 200, 10, 45, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
     PUSHBUTTON "Avbryt", IDCANCEL, 200, 28, 45, 14, WS_GROUP | WS_TABSTOP

dlls/mshtml/Zh.rc

@@ -49,10 +49,10 @@ STYLE DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "超链接"
 FONT 9, "MS Shell Dlg"
 {
-    GROUPBOX "超链接信息", IDC_STATIC, 5, 5, 190, 55
-    LTEXT "类型(&T):", IDC_STATIC, 10, 22, 20, 10
+    GROUPBOX "超链接信息", -1, 5, 5, 190, 55
+    LTEXT "类型(&T):", -1, 10, 22, 20, 10
     COMBOBOX IDC_TYPE, 35, 20, 45, 100, WS_TABSTOP | WS_GROUP | WS_VSCROLL | CBS_DROPDOWNLIST | CBS_HASSTRINGS
-    LTEXT "网址(&U):", IDC_STATIC, 10, 42, 20, 10
+    LTEXT "网址(&U):", -1, 10, 42, 20, 10
     EDITTEXT IDC_URL, 35, 40, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP
     PUSHBUTTON "确定", IDOK, 200, 10, 45, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
     PUSHBUTTON "取消", IDCANCEL, 200, 28, 45, 14, WS_GROUP | WS_TABSTOP
@@ -86,10 +86,10 @@ STYLE DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "超鏈接"
 FONT 9, "MS Shell Dlg"
 {
-    GROUPBOX "超鏈接資訊", IDC_STATIC, 5, 5, 190, 55
-    LTEXT "類型(&T):", IDC_STATIC, 10, 22, 20, 10
+    GROUPBOX "超鏈接資訊", -1, 5, 5, 190, 55
+    LTEXT "類型(&T):", -1, 10, 22, 20, 10
     COMBOBOX IDC_TYPE, 35, 20, 45, 100, WS_TABSTOP | WS_GROUP | WS_VSCROLL | CBS_DROPDOWNLIST | CBS_HASSTRINGS
-    LTEXT "網址(&U):", IDC_STATIC, 10, 42, 20, 10
+    LTEXT "網址(&U):", -1, 10, 42, 20, 10
     EDITTEXT IDC_URL, 35, 40, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP
     PUSHBUTTON "確定", IDOK, 200, 10, 45, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
     PUSHBUTTON "取消", IDCANCEL, 200, 28, 45, 14, WS_GROUP | WS_TABSTOP

dlls/mshtml/resource.h

@@ -52,6 +52,5 @@
 
 #define IDD_HYPERLINK           8000
 
-#define IDC_STATIC              9000
 #define IDC_URL                 9001
 #define IDC_TYPE                9002