mirror of
git://source.winehq.org/git/wine.git
synced 2024-09-06 21:59:59 +00:00
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:
parent
55827134d1
commit
7daf030473
|
@ -344,20 +344,18 @@ static HRESULT WINAPI IDirectMusic8Impl_EnumMasterClock(LPDIRECTMUSIC8 iface, DW
|
|||
if (!index)
|
||||
{
|
||||
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->guidClock = guid_system_clock;
|
||||
lstrcpyW(clock_info->wszDescription, name_system_clock);
|
||||
lstrcpyW(clock_info->wszDescription, L"System Clock");
|
||||
}
|
||||
else
|
||||
{
|
||||
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->guidClock = guid_dsound_clock;
|
||||
lstrcpyW(clock_info->wszDescription, name_dsound_clock);
|
||||
lstrcpyW(clock_info->wszDescription, L"DirectSound Clock");
|
||||
}
|
||||
|
||||
return S_OK;
|
||||
|
@ -497,7 +495,7 @@ static const IDirectMusic8Vtbl DirectMusic8_Vtbl = {
|
|||
|
||||
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;
|
||||
ULONG nb_ports;
|
||||
ULONG nb_midi_out;
|
||||
|
|
|
@ -639,7 +639,6 @@ static void test_parsedescriptor(void)
|
|||
IStream *stream;
|
||||
DMUS_OBJECTDESC desc = {0};
|
||||
HRESULT hr;
|
||||
const WCHAR s_inam[] = {'I','N','A','M','\0'};
|
||||
const FOURCC alldesc[] =
|
||||
{
|
||||
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(desc.dwValidData == (DMUS_OBJ_CLASS | DMUS_OBJ_NAME),
|
||||
"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));
|
||||
IStream_Release(stream);
|
||||
|
||||
|
@ -747,7 +746,7 @@ static void test_parsedescriptor(void)
|
|||
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",
|
||||
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));
|
||||
IStream_Release(stream);
|
||||
|
||||
|
|
Loading…
Reference in a new issue