ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

dmusic: Use wide-char string literals. 

Signed-off-by: Michael Stefaniuc <mstefani@winehq.org>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Michael Stefaniuc 2020-01-21 22:24:44 +01:00 committed by Alexandre Julliard
parent 55827134d1
commit 7daf030473
2 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
dlls/dmusic/dmusic.c
View File

@ -344,20 +344,18 @@ static HRESULT WINAPI IDirectMusic8Impl_EnumMasterClock(LPDIRECTMUSIC8 iface, DW
if (!index) if (!index)
{ {
static const GUID guid_system_clock = { 0x58d58419, 0x71b4, 0x11d1, { 0xa7, 0x4c, 0x00, 0x00, 0xf8, 0x75, 0xac, 0x12 } }; static const GUID guid_system_clock = { 0x58d58419, 0x71b4, 0x11d1, { 0xa7, 0x4c, 0x00, 0x00, 0xf8, 0x75, 0xac, 0x12 } };
static const WCHAR name_system_clock[] = { 'S','y','s','t','e','m',' ','C','l','o','c','k',0 };
clock_info->ctType = 0; clock_info->ctType = 0;
clock_info->guidClock = guid_system_clock; clock_info->guidClock = guid_system_clock;
lstrcpyW(clock_info->wszDescription, name_system_clock); lstrcpyW(clock_info->wszDescription, L"System Clock");
} }
else else
{ {
static const GUID guid_dsound_clock = { 0x58d58420, 0x71b4, 0x11d1, { 0xa7, 0x4c, 0x00, 0x00, 0xf8, 0x75, 0xac, 0x12 } }; static const GUID guid_dsound_clock = { 0x58d58420, 0x71b4, 0x11d1, { 0xa7, 0x4c, 0x00, 0x00, 0xf8, 0x75, 0xac, 0x12 } };
static const WCHAR name_dsound_clock[] = { 'D','i','r','e','c','t','S','o','u','n','d',' ','C','l','o','c','k',0 };
clock_info->ctType = 0; clock_info->ctType = 0;
clock_info->guidClock = guid_dsound_clock; clock_info->guidClock = guid_dsound_clock;
lstrcpyW(clock_info->wszDescription, name_dsound_clock); lstrcpyW(clock_info->wszDescription, L"DirectSound Clock");
} }
return S_OK; return S_OK;
@ -497,7 +495,7 @@ static const IDirectMusic8Vtbl DirectMusic8_Vtbl = {
static void create_system_ports_list(IDirectMusic8Impl* object) static void create_system_ports_list(IDirectMusic8Impl* object)
{ {
static const WCHAR emulated[] = {' ','[','E','m','u','l','a','t','e','d',']',0}; static const WCHAR emulated[] = L" [Emulated]";
port_info * port; port_info * port;
ULONG nb_ports; ULONG nb_ports;
ULONG nb_midi_out; ULONG nb_midi_out;

5
dlls/dmusic/tests/dmusic.c
View File

@ -639,7 +639,6 @@ static void test_parsedescriptor(void)
IStream *stream; IStream *stream;
DMUS_OBJECTDESC desc = {0}; DMUS_OBJECTDESC desc = {0};
HRESULT hr; HRESULT hr;
const WCHAR s_inam[] = {'I','N','A','M','\0'};
const FOURCC alldesc[] = const FOURCC alldesc[] =
{ {
FOURCC_RIFF, FOURCC_DLS, DMUS_FOURCC_CATEGORY_CHUNK, FOURCC_LIST, FOURCC_RIFF, FOURCC_DLS, DMUS_FOURCC_CATEGORY_CHUNK, FOURCC_LIST,
@ -735,7 +734,7 @@ static void test_parsedescriptor(void)
ok(hr == S_OK, "ParseDescriptor failed: %08x, expected S_OK\n", hr); ok(hr == S_OK, "ParseDescriptor failed: %08x, expected S_OK\n", hr);
ok(desc.dwValidData == (DMUS_OBJ_CLASS | DMUS_OBJ_NAME), ok(desc.dwValidData == (DMUS_OBJ_CLASS | DMUS_OBJ_NAME),
"Got valid data %#x, expected DMUS_OBJ_CLASS | DMUS_OBJ_NAME\n", desc.dwValidData); "Got valid data %#x, expected DMUS_OBJ_CLASS | DMUS_OBJ_NAME\n", desc.dwValidData);
ok(!memcmp(desc.wszName, s_inam, sizeof(s_inam)), "Got name '%s', expected 'INAM'\n", ok(!lstrcmpW(desc.wszName, L"INAM"), "Got name '%s', expected 'INAM'\n",
wine_dbgstr_w(desc.wszName)); wine_dbgstr_w(desc.wszName));
IStream_Release(stream); IStream_Release(stream);
@ -747,7 +746,7 @@ static void test_parsedescriptor(void)
ok(desc.dwValidData == (DMUS_OBJ_CLASS | DMUS_OBJ_NAME | DMUS_OBJ_VERSION), ok(desc.dwValidData == (DMUS_OBJ_CLASS | DMUS_OBJ_NAME | DMUS_OBJ_VERSION),
"Got valid data %#x, expected DMUS_OBJ_CLASS | DMUS_OBJ_NAME | DMUS_OBJ_VERSION\n", "Got valid data %#x, expected DMUS_OBJ_CLASS | DMUS_OBJ_NAME | DMUS_OBJ_VERSION\n",
desc.dwValidData); desc.dwValidData);
ok(!memcmp(desc.wszName, s_inam, sizeof(s_inam)), "Got name '%s', expected 'INAM'\n", ok(!lstrcmpW(desc.wszName, L"INAM"), "Got name '%s', expected 'INAM'\n",
wine_dbgstr_w(desc.wszName)); wine_dbgstr_w(desc.wszName));
IStream_Release(stream); IStream_Release(stream);