browser/app/module.ver

@@ -1,8 +1,8 @@
 WIN32_MODULE_COMPANYNAME=@MOZ_APP_VENDOR@
-WIN32_MODULE_COPYRIGHT=<EFBFBD>Dactyloidae Project, Eclipse Community, Basilisk and Mozilla Developers; available under the MPL 2 license.
+WIN32_MODULE_COPYRIGHT=©Eclipse Community, Basilisk and Mozilla Developers; available under the MPL 2 license.
 WIN32_MODULE_PRODUCTVERSION=@MOZ_APP_WINVERSION@
 WIN32_MODULE_PRODUCTVERSION_STRING=@MOZ_APP_VERSION@
-WIN32_MODULE_TRADEMARKS=The Dactyloidae logo and project names are trademarks of Eclipse Community and Dactyloidae Project.
-WIN32_MODULE_DESCRIPTION=@MOZ_APP_DISPLAYNAME@
+WIN32_MODULE_TRADEMARKS=The Hydra logo and project names are trademarks of Eclipse Community.
+WIN32_MODULE_DESCRIPTION=@MOZ_APP_DISPLAYNAME@ web browser
 WIN32_MODULE_PRODUCTNAME=@MOZ_APP_DISPLAYNAME@
 WIN32_MODULE_NAME=@MOZ_APP_DISPLAYNAME@

media/libcubeb/src/cubeb_wasapi.cpp

@@ -938,12 +938,6 @@ BOOL WINAPI revert_mm_thread_characteristics_noop(HANDLE mmcss_handle)
 
 HRESULT register_notification_client(cubeb_stream * stm)
 {
-#if defined(__MINGW32__)
-  // MinGW builds have shown crashes in MMDevApi callback dispatch paths.
-  // Skip notification registration and rely on normal stream operation.
-  (void)stm;
-  return S_OK;
-#else
   HRESULT hr = CoCreateInstance(__uuidof(MMDeviceEnumerator),
                                 NULL, CLSCTX_INPROC_SERVER,
                                 IID_PPV_ARGS(&stm->device_enumerator));
@@ -964,15 +958,10 @@ HRESULT register_notification_client(cubeb_stream * stm)
   }
 
   return hr;
-#endif
 }
 
 HRESULT unregister_notification_client(cubeb_stream * stm)
 {
-#if defined(__MINGW32__)
-  (void)stm;
-  return S_OK;
-#else
   XASSERT(stm);
   HRESULT hr;
 
@@ -992,7 +981,6 @@ HRESULT unregister_notification_client(cubeb_stream * stm)
   SafeRelease(stm->device_enumerator);
 
   return S_OK;
-#endif
 }
 
 HRESULT get_endpoint(IMMDevice ** device, LPCWSTR devid)

media/libcubeb/src/moz.build

@@ -67,7 +67,7 @@ if CONFIG['OS_TARGET'] == 'WINNT':
         'cubeb_winmm.c',
     ]
     DEFINES['USE_WINMM'] = True
-    if CONFIG['MOZ_SAMPLE_TYPE_FLOAT32'] and not CONFIG['GNU_CC']:
+    if CONFIG['MOZ_SAMPLE_TYPE_FLOAT32']:
         DEFINES['USE_WASAPI'] = True
         SOURCES += [
             'cubeb_wasapi.cpp',

mozglue/misc/StackWalk.cpp

@@ -851,12 +851,7 @@ MozDescribeCodeAddress(void* aPC, MozCodeAddressDetails* aDetails)
   pSymbol->MaxNameLen = MAX_SYM_NAME;
 
   DWORD64 displacement;
-#ifdef __MINGW32__
-  // SymFromAddr is not available in MinGW dbghelp.dll
-  ok = FALSE;
-#else
   ok = SymFromAddr(myProcess, addr, &displacement, pSymbol);
-#endif
 
   if (ok) {
     strncpy(aDetails->function, pSymbol->Name,

security/nss/lib/util/quickder.c

@@ -8,14 +8,7 @@
 
 #include "secerr.h"
 #include "secasn1.h" /* for SEC_ASN1GetSubtemplate */
-
-#if defined(_WIN32) && !defined(_WIN64)
-static __inline void* Win2000_EncodePointer(void* p) { return p; }
-static __inline void* Win2000_DecodePointer(void* p) { return p; }
-
-#define EncodePointer(p) Win2000_EncodePointer(p)
-#define DecodePointer(p) Win2000_DecodePointer(p)
-#endif
+#include "secitem.h"
 
 /*
  * simple definite-length ASN.1 decoder