diff --git a/mozilla/embedding/qa/testembed/Makefile.in b/mozilla/embedding/qa/testembed/Makefile.in index ab4a54498b6..cf1f275b195 100644 --- a/mozilla/embedding/qa/testembed/Makefile.in +++ b/mozilla/embedding/qa/testembed/Makefile.in @@ -143,7 +143,7 @@ LDFLAGS += /HEAP:0x40000 include $(topsrcdir)/config/rules.mk -CXXFLAGS += /D "_AFXDLL" /D "USE_SINGLE_SIGN_ON" +CXXFLAGS += /D "_AFXDLL" /D "USE_SINGLE_SIGN_ON" -DMOZILLA_VERSION=\"$(MOZILLA_VERSION)\" LDFLAGS += -SUBSYSTEM:windows libs:: testembed.htm diff --git a/mozilla/embedding/qa/testembed/winEmbedFileLocProvider.cpp b/mozilla/embedding/qa/testembed/winEmbedFileLocProvider.cpp index e6bc950f9df..d1219f13e0b 100644 --- a/mozilla/embedding/qa/testembed/winEmbedFileLocProvider.cpp +++ b/mozilla/embedding/qa/testembed/winEmbedFileLocProvider.cpp @@ -197,7 +197,7 @@ static char * GetGreLocationFromRegistry() // Please see http://www.mozilla.org/projects/embedding/MRE.html for // more info. // - strcpy(szKey, "Software\\Mozilla\\GRE\\1.3a"); + strcpy(szKey, "Software\\Mozilla\\GRE\\" MOZILLA_VERSION); if (::RegOpenKeyEx(HKEY_LOCAL_MACHINE, szKey, 0, KEY_QUERY_VALUE, &hRegKey) == ERROR_SUCCESS) { diff --git a/mozilla/embedding/tests/mfcembed/Makefile.in b/mozilla/embedding/tests/mfcembed/Makefile.in index aa83514499d..17e66a1e0fc 100644 --- a/mozilla/embedding/tests/mfcembed/Makefile.in +++ b/mozilla/embedding/tests/mfcembed/Makefile.in @@ -116,7 +116,7 @@ LDFLAGS += /HEAP:0x40000 include $(topsrcdir)/config/rules.mk -CXXFLAGS += /D "_AFXDLL" /D "USE_SINGLE_SIGN_ON" +CXXFLAGS += /D "_AFXDLL" /D "USE_SINGLE_SIGN_ON" -DMOZILLA_VERSION=\"$(MOZILLA_VERSION)\" LDFLAGS += -SUBSYSTEM:windows libs:: mfcembed.htm diff --git a/mozilla/embedding/tests/mfcembed/winEmbedFileLocProvider.cpp b/mozilla/embedding/tests/mfcembed/winEmbedFileLocProvider.cpp index b66b0f58dc3..69f7f8533e4 100644 --- a/mozilla/embedding/tests/mfcembed/winEmbedFileLocProvider.cpp +++ b/mozilla/embedding/tests/mfcembed/winEmbedFileLocProvider.cpp @@ -204,7 +204,7 @@ char * winEmbedFileLocProvider::GetGreLocationFromRegistry() // Please see http://www.mozilla.org/projects/embedding/MRE.html for // more info. // - strcpy(szKey, "Software\\mozilla.org\\GRE\\1.3a"); + strcpy(szKey, "Software\\mozilla.org\\GRE\\" MOZILLA_VERSION); if (::RegOpenKeyEx(HKEY_LOCAL_MACHINE, szKey, 0, KEY_QUERY_VALUE, &hRegKey) == ERROR_SUCCESS) {