Michael Stefaniuc : dsound: Use wide-char string literals.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 716cfcb163a5fe670023155a751fcfd83cc3b28f
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=716cfcb163a5fe670023155a7...

Author: Michael Stefaniuc 
Date:   Sun Oct 18 23:33:26 2020 +0200

dsound: Use wide-char string literals.

Signed-off-by: Michael Stefaniuc 
Signed-off-by: Alexandre Julliard

---

dlls/dsound/dsound_main.c | 10 +++-------
 dlls/dsound/propset.c     |  2 +-
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/dlls/dsound/dsound_main.c b/dlls/dsound/dsound_main.c
index 3acee554ad9..ca33ba48046 100644
--- a/dlls/dsound/dsound_main.c
+++ b/dlls/dsound/dsound_main.c
@@ -88,7 +88,7 @@ CRITICAL_SECTION DSOUND_capturers_lock = { &DSOUND_capturers_lock_debug, -1, 0,
 GUID                    DSOUND_renderer_guids[MAXWAVEDRIVERS];
 GUID                    DSOUND_capture_guids[MAXWAVEDRIVERS];

-const WCHAR wine_vxd_drv[] = { 'w','i','n','e','m','m','.','v','x','d', 0 };
+const WCHAR wine_vxd_drv[] = L"winemm.vxd";

/* All default settings, you most likely don't want to touch these, see wiki on UsefulRegistryKeys */
 int ds_hel_buflen = 32768 * 2;
@@ -454,10 +454,6 @@ HRESULT enumerate_mmdevices(EDataFlow flow, GUID *guids,
     BOOL keep_going;
     HRESULT hr, init_hr;

-    static const WCHAR primary_desc[] = {'P','r','i','m','a','r','y',' ',
-        'S','o','u','n','d',' ','D','r','i','v','e','r',0};
-    static const WCHAR empty_drv[] = {0};
-
     init_hr = get_mmdevenum(&devenum);
     if(!devenum)
         return init_hr;
@@ -484,8 +480,8 @@ HRESULT enumerate_mmdevices(EDataFlow flow, GUID *guids,
         return DS_OK;
     }

-    TRACE("Calling back with NULL (%s)\n", wine_dbgstr_w(primary_desc));
-    keep_going = cb(NULL, primary_desc, empty_drv, user);
+    TRACE("Calling back with NULL (Primary Sound Driver)\n");
+    keep_going = cb(NULL, L"Primary Sound Driver", L"", user);

/* always send the default device first */
     if(keep_going){
diff --git a/dlls/dsound/propset.c b/dlls/dsound/propset.c
index dcb2b871783..f1f71bef135 100644
--- a/dlls/dsound/propset.c
+++ b/dlls/dsound/propset.c
@@ -42,7 +42,7 @@

WINE_DEFAULT_DEBUG_CHANNEL(dsound);

-static WCHAR wInterface[] = { 'I','n','t','e','r','f','a','c','e',0 };
+static WCHAR wInterface[] = L"Interface";

typedef struct IKsPrivatePropertySetImpl
 {