From fefac2c941149fb49bcb5126060be74494d0c287 Mon Sep 17 00:00:00 2001
From: wm4 <wm4@nowhere>
Date: Thu, 30 Jul 2015 21:50:11 +0200
Subject: win32: more wchar_t -> WCHAR replacements

This was essentially missing from commit 0b52ac8a.

Since L"..." string literals have the type wchar_t[], we can't use them
for UTF-16 strings. Use C11 u"..." string literals instead. These have
the type char16_t[], but we simply assume char16_t is the same
underlying type as WCHAR. In practice, they're both unsigned short.

For this reason use -std=c11 on Windows. Since Windows is a "special"
environment (we require either MinGW or Cygwin), we don't need to worry
too much about compiler compatibility.
---
 audio/out/ao_dsound.c              | 2 +-
 audio/out/ao_wasapi_changenotify.c | 8 ++++----
 audio/out/ao_wasapi_utils.c        | 8 ++++----
 3 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'audio/out')

diff --git a/audio/out/ao_dsound.c b/audio/out/ao_dsound.c
index 3e950c3bab..6aae40ce53 100644
--- a/audio/out/ao_dsound.c
+++ b/audio/out/ao_dsound.c
@@ -227,7 +227,7 @@ static int LoadDirectSound(struct ao *ao)
     struct priv *p = ao->priv;
 
     // initialize directsound
-    p->hdsound_dll = LoadLibrary(L"DSOUND.DLL");
+    p->hdsound_dll = LoadLibraryW(u"DSOUND.DLL");
     if (p->hdsound_dll == NULL) {
         MP_ERR(ao, "cannot load DSOUND.DLL\n");
         return 0;
diff --git a/audio/out/ao_wasapi_changenotify.c b/audio/out/ao_wasapi_changenotify.c
index 1521578b19..41a93f6593 100755
--- a/audio/out/ao_wasapi_changenotify.c
+++ b/audio/out/ao_wasapi_changenotify.c
@@ -67,7 +67,7 @@ static HRESULT STDMETHODCALLTYPE sIMMNotificationClient_OnDeviceStateChanged(
     if (change->is_hotplug) {
         MP_VERBOSE(ao, "OnDeviceStateChanged triggered: sending hotplug event\n");
         ao_hotplug_event(ao);
-    } else if (pwstrDeviceId && !wcscmp(pwstrDeviceId, change->monitored)) {
+    } else if (pwstrDeviceId && !lstrcmpW(pwstrDeviceId, change->monitored)) {
         switch (dwNewState) {
         case DEVICE_STATE_DISABLED:
         case DEVICE_STATE_NOTPRESENT:
@@ -110,7 +110,7 @@ static HRESULT STDMETHODCALLTYPE sIMMNotificationClient_OnDeviceRemoved(
     if (change->is_hotplug) {
         MP_VERBOSE(ao, "OnDeviceRemoved triggered: sending hotplug event\n");
         ao_hotplug_event(ao);
-    } else if (pwstrDeviceId && !wcscmp(pwstrDeviceId, change->monitored)) {
+    } else if (pwstrDeviceId && !lstrcmpW(pwstrDeviceId, change->monitored)) {
         MP_VERBOSE(ao, "OnDeviceRemoved triggered for device %S: "
                    "requesting ao reload\n", pwstrDeviceId);
         ao_request_reload(ao);
@@ -144,7 +144,7 @@ static HRESULT STDMETHODCALLTYPE sIMMNotificationClient_OnDefaultDeviceChanged(
         }
 
         /* don't reload if already on the new default */
-        if (pwstrDeviceId && !wcscmp(pwstrDeviceId, change->monitored)) {
+        if (pwstrDeviceId && !lstrcmpW(pwstrDeviceId, change->monitored)) {
             MP_VERBOSE(ao, "OnDefaultDeviceChanged triggered: "
                        "already using default device, no reload required\n");
             return S_OK;
@@ -167,7 +167,7 @@ static HRESULT STDMETHODCALLTYPE sIMMNotificationClient_OnPropertyValueChanged(
     struct ao *ao = change->ao;
 
     if (!change->is_hotplug && pwstrDeviceId &&
-        !wcscmp(pwstrDeviceId, change->monitored))
+        !lstrcmpW(pwstrDeviceId, change->monitored))
     {
         MP_VERBOSE(ao, "OnPropertyValueChanged triggered on device %S\n",
                    pwstrDeviceId);
diff --git a/audio/out/ao_wasapi_utils.c b/audio/out/ao_wasapi_utils.c
index 8410d0fcf5..fdd0048ae1 100755
--- a/audio/out/ao_wasapi_utils.c
+++ b/audio/out/ao_wasapi_utils.c
@@ -34,7 +34,7 @@
 #include "osdep/io.h"
 #include "osdep/timer.h"
 
-#define MIXER_DEFAULT_LABEL L"mpv - video player"
+#define MIXER_DEFAULT_LABEL u"mpv - video player"
 
 DEFINE_PROPERTYKEY(mp_PKEY_Device_FriendlyName,
                    0xa45c254e, 0xdf1c, 0x4efd, 0x80, 0x20,
@@ -190,7 +190,7 @@ bool wasapi_fill_VistaBlob(wasapi_state *state)
 {
     if (!state)
         goto exit_label;
-    state->VistaBlob.hAvrt = LoadLibraryW(L"avrt.dll");
+    state->VistaBlob.hAvrt = LoadLibraryW(u"avrt.dll");
     if (!state->VistaBlob.hAvrt)
         goto exit_label;
 
@@ -620,7 +620,7 @@ static HRESULT init_session_display(struct wasapi_state *state) {
     EXIT_ON_ERROR(hr);
 
     GetModuleFileNameW(NULL, path, MAX_PATH);
-    lstrcatW(path, L",-IDI_ICON1");
+    lstrcatW(path, u",-IDI_ICON1");
 
     hr = IAudioSessionControl_SetDisplayName(state->pSessionControl, MIXER_DEFAULT_LABEL, NULL);
     EXIT_ON_ERROR(hr);
@@ -725,7 +725,7 @@ reinit:
 
     if (state->VistaBlob.hAvrt) {
         state->hTask =
-            state->VistaBlob.pAvSetMmThreadCharacteristicsW(L"Pro Audio", &state->taskIndex);
+            state->VistaBlob.pAvSetMmThreadCharacteristicsW(u"Pro Audio", &state->taskIndex);
     }
 
     MP_VERBOSE(state, "Format fixed. Using %lld byte buffer block size\n",
-- 
cgit v1.2.3