From b7fdedd323f38caca80118db7924c1fa1487027a Mon Sep 17 00:00:00 2001 From: Zebediah Figura Date: Sat, 31 Mar 2018 16:25:14 -0500 Subject: [PATCH] devenum: Register waveOut devices as codec devices. Signed-off-by: Zebediah Figura Signed-off-by: Alexandre Julliard --- dlls/devenum/createdevenum.c | 131 ++++++++++++++++++++------------- dlls/devenum/devenum.rc | 1 - dlls/devenum/devenum_private.h | 1 - dlls/devenum/tests/Makefile.in | 2 +- dlls/devenum/tests/devenum.c | 109 +++++++++++++++++++++++++++ po/ar.po | 4 - po/bg.po | 4 - po/ca.po | 4 - po/cs.po | 4 - po/da.po | 4 - po/de.po | 4 - po/el.po | 4 - po/en.po | 4 - po/en_US.po | 4 - po/eo.po | 4 - po/es.po | 4 - po/fa.po | 4 - po/fi.po | 4 - po/fr.po | 4 - po/he.po | 5 -- po/hi.po | 4 - po/hr.po | 4 - po/hu.po | 4 - po/it.po | 4 - po/ja.po | 4 - po/ko.po | 4 - po/lt.po | 4 - po/ml.po | 4 - po/nb_NO.po | 4 - po/nl.po | 4 - po/or.po | 4 - po/pa.po | 4 - po/pl.po | 4 - po/pt_BR.po | 4 - po/pt_PT.po | 4 - po/rm.po | 4 - po/ro.po | 4 - po/ru.po | 4 - po/sk.po | 4 - po/sl.po | 4 - po/sr_RS@cyrillic.po | 4 - po/sr_RS@latin.po | 4 - po/sv.po | 4 - po/te.po | 4 - po/th.po | 4 - po/tr.po | 4 - po/uk.po | 4 - po/wa.po | 4 - po/wine.pot | 4 - po/zh_CN.po | 4 - po/zh_TW.po | 4 - 51 files changed, 190 insertions(+), 239 deletions(-) diff --git a/dlls/devenum/createdevenum.c b/dlls/devenum/createdevenum.c index 6884ffc6cae..e3fe04964e4 100644 --- a/dlls/devenum/createdevenum.c +++ b/dlls/devenum/createdevenum.c @@ -594,6 +594,85 @@ cleanup: return TRUE; } +static void register_waveout_devices(void) +{ + static const WCHAR defaultW[] = {'D','e','f','a','u','l','t',' ','W','a','v','e','O','u','t',' ','D','e','v','i','c','e',0}; + static const WCHAR waveoutidW[] = {'W','a','v','e','O','u','t','I','d',0}; + IPropertyBag *prop_bag = NULL; + REGFILTERPINS2 rgpins = {0}; + REGPINTYPES rgtypes = {0}; + REGFILTER2 rgf = {0}; + WCHAR clsid[CHARS_IN_GUID]; + IMoniker *mon = NULL; + WAVEOUTCAPSW caps; + int i, count; + VARIANT var; + HRESULT hr; + + hr = DEVENUM_CreateAMCategoryKey(&CLSID_AudioRendererCategory); + if (FAILED(hr)) return; + + count = waveOutGetNumDevs(); + + for (i = -1; i < count; i++) + { + waveOutGetDevCapsW(i, &caps, sizeof(caps)); + + V_VT(&var) = VT_BSTR; + + if (i == -1) /* WAVE_MAPPER */ + V_BSTR(&var) = SysAllocString(defaultW); + else + V_BSTR(&var) = SysAllocString(caps.szPname); + if (!(V_BSTR(&var))) + goto cleanup; + + hr = register_codec(&CLSID_AudioRendererCategory, V_BSTR(&var), &mon); + if (FAILED(hr)) goto cleanup; + + hr = IMoniker_BindToStorage(mon, NULL, NULL, &IID_IPropertyBag, (void **)&prop_bag); + if (FAILED(hr)) goto cleanup; + + /* write friendly name */ + hr = IPropertyBag_Write(prop_bag, wszFriendlyName, &var); + if (FAILED(hr)) goto cleanup; + VariantClear(&var); + + /* write clsid */ + V_VT(&var) = VT_BSTR; + StringFromGUID2(&CLSID_AudioRender, clsid, CHARS_IN_GUID); + if (!(V_BSTR(&var) = SysAllocString(clsid))) + goto cleanup; + hr = IPropertyBag_Write(prop_bag, clsid_keyname, &var); + if (FAILED(hr)) goto cleanup; + VariantClear(&var); + + /* write filter data */ + rgf.dwVersion = 2; + rgf.dwMerit = MERIT_DO_NOT_USE; + rgf.u.s2.cPins2 = 1; + rgf.u.s2.rgPins2 = &rgpins; + rgpins.dwFlags = REG_PINFLAG_B_RENDERER; + rgpins.nMediaTypes = 1; + rgpins.lpMediaType = &rgtypes; + rgtypes.clsMajorType = &MEDIATYPE_Audio; + rgtypes.clsMinorType = &MEDIASUBTYPE_NULL; + + write_filter_data(prop_bag, &rgf); + + /* write WaveOutId */ + V_VT(&var) = VT_I4; + V_I4(&var) = i; + hr = IPropertyBag_Write(prop_bag, waveoutidW, &var); + if (FAILED(hr)) goto cleanup; + +cleanup: + VariantClear(&var); + if (prop_bag) IPropertyBag_Release(prop_bag); + if (mon) IMoniker_Release(mon); + } +} + /********************************************************************** * DEVENUM_ICreateDevEnum_CreateClassEnumerator */ @@ -616,6 +695,7 @@ static HRESULT WINAPI DEVENUM_ICreateDevEnum_CreateClassEnumerator( register_legacy_filters(); hr = DirectSoundEnumerateW(®ister_dsound_devices, NULL); if (FAILED(hr)) return hr; + register_waveout_devices(); return create_EnumMoniker(clsidDeviceClass, ppEnumMoniker); } @@ -752,62 +832,11 @@ static HRESULT register_codecs(void) if (SUCCEEDED(res)) { UINT i; - WAVEOUTCAPSW wocaps; WAVEINCAPSW wicaps; MIDIOUTCAPSW mocaps; REGPINTYPES * pTypes; IPropertyBag * pPropBag = NULL; - numDevs = waveOutGetNumDevs(); - - res = DEVENUM_CreateAMCategoryKey(&CLSID_AudioRendererCategory); - if (FAILED(res)) /* can't register any devices in this category */ - numDevs = 0; - - rfp2.dwFlags = REG_PINFLAG_B_RENDERER; - for (i = 0; i < numDevs; i++) - { - if (waveOutGetDevCapsW(i, &wocaps, sizeof(WAVEOUTCAPSW)) - == MMSYSERR_NOERROR) - { - IMoniker * pMoniker = NULL; - - rfp2.nMediaTypes = 1; - pTypes = CoTaskMemAlloc(rfp2.nMediaTypes * sizeof(REGPINTYPES)); - if (!pTypes) - { - IFilterMapper2_Release(pMapper); - return E_OUTOFMEMORY; - } - /* FIXME: Native devenum seems to register a lot more types for - * DSound than we do. Not sure what purpose they serve */ - pTypes[0].clsMajorType = &MEDIATYPE_Audio; - pTypes[0].clsMinorType = &MEDIASUBTYPE_PCM; - - rfp2.lpMediaType = pTypes; - - res = IFilterMapper2_RegisterFilter(pMapper, - &CLSID_AudioRender, - wocaps.szPname, - &pMoniker, - &CLSID_AudioRendererCategory, - wocaps.szPname, - &rf2); - - /* FIXME: do additional stuff with IMoniker here, depending on what RegisterFilter does */ - - if (pMoniker) - IMoniker_Release(pMoniker); - - if (i == iDefaultDevice) - { - FIXME("Default device\n"); - } - - CoTaskMemFree(pTypes); - } - } - numDevs = waveInGetNumDevs(); res = DEVENUM_CreateAMCategoryKey(&CLSID_AudioInputDeviceCategory); diff --git a/dlls/devenum/devenum.rc b/dlls/devenum/devenum.rc index d9262e18a59..95e39d61ae6 100644 --- a/dlls/devenum/devenum.rc +++ b/dlls/devenum/devenum.rc @@ -29,7 +29,6 @@ LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT STRINGTABLE { - IDS_DEVENUM_WODEFAULT "Default WaveOut Device" IDS_DEVENUM_MIDEFAULT "Default MidiOut Device" } diff --git a/dlls/devenum/devenum_private.h b/dlls/devenum/devenum_private.h index 93147ad19cb..c89108354d2 100644 --- a/dlls/devenum/devenum_private.h +++ b/dlls/devenum/devenum_private.h @@ -101,7 +101,6 @@ extern const WCHAR clsid_keyname[6] DECLSPEC_HIDDEN; /********************************************************************** * Resource IDs */ -#define IDS_DEVENUM_WODEFAULT 9 #define IDS_DEVENUM_MIDEFAULT 10 #define IDS_DEVENUM_KSDEFAULT 11 #define IDS_DEVENUM_KS 12 diff --git a/dlls/devenum/tests/Makefile.in b/dlls/devenum/tests/Makefile.in index 028ba27b505..a673f2077ec 100644 --- a/dlls/devenum/tests/Makefile.in +++ b/dlls/devenum/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = devenum.dll -IMPORTS = advapi32 dsound oleaut32 ole32 +IMPORTS = advapi32 dsound oleaut32 ole32 winmm C_SRCS = \ devenum.c diff --git a/dlls/devenum/tests/devenum.c b/dlls/devenum/tests/devenum.c index c4bf8afe531..79f5ed87ec0 100644 --- a/dlls/devenum/tests/devenum.c +++ b/dlls/devenum/tests/devenum.c @@ -30,6 +30,7 @@ #include "vfwmsgs.h" #include "mmsystem.h" #include "dsound.h" +#include "mmddk.h" DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0); @@ -37,11 +38,25 @@ static const WCHAR friendly_name[] = {'F','r','i','e','n','d','l','y','N','a','m static const WCHAR fcc_handlerW[] = {'F','c','c','H','a','n','d','l','e','r',0}; static const WCHAR deviceW[] = {'@','d','e','v','i','c','e',':',0}; static const WCHAR clsidW[] = {'C','L','S','I','D',0}; +static const WCHAR waveW[] = {'w','a','v','e',':',0}; static const WCHAR mrleW[] = {'m','r','l','e',0}; static const WCHAR swW[] = {'s','w',':',0}; static const WCHAR cmW[] = {'c','m',':',0}; static const WCHAR backslashW[] = {'\\',0}; +static inline WCHAR *strchrW( const WCHAR *str, WCHAR ch ) +{ + do { if (*str == ch) return (WCHAR *)str; } while (*str++); + return NULL; +} + +static inline int strncmpW( const WCHAR *str1, const WCHAR *str2, int n ) +{ + if (n <= 0) return 0; + while ((--n > 0) && *str1 && (*str1 == *str2)) { str1++; str2++; } + return *str1 - *str2; +} + static void test_devenum(IBindCtx *bind_ctx) { IEnumMoniker *enum_cat, *enum_moniker; @@ -618,6 +633,99 @@ static BOOL CALLBACK test_dsound(GUID *guid, const WCHAR *desc, const WCHAR *mod return TRUE; } +static void test_waveout(void) +{ + static const WCHAR defaultW[] = {'D','e','f','a','u','l','t',' ','W','a','v','e','O','u','t',' ','D','e','v','i','c','e',0}; + static const WCHAR waveoutidW[] = {'W','a','v','e','O','u','t','I','d',0}; + IParseDisplayName *parser; + IPropertyBag *prop_bag; + IMoniker *mon; + WCHAR endpoint[200]; + WAVEOUTCAPSW caps; + WCHAR buffer[200]; + const WCHAR *name; + MMRESULT mmr; + int count, i; + VARIANT var; + HRESULT hr; + + hr = CoCreateInstance(&CLSID_CDeviceMoniker, NULL, CLSCTX_INPROC, &IID_IParseDisplayName, (void **)&parser); + ok(hr == S_OK, "Failed to create ParseDisplayName: %#x\n", hr); + + count = waveOutGetNumDevs(); + + for (i = -1; i < count; i++) + { + waveOutGetDevCapsW(i, &caps, sizeof(caps)); + + if (i == -1) /* WAVE_MAPPER */ + name = defaultW; + else + name = caps.szPname; + + lstrcpyW(buffer, deviceW); + lstrcatW(buffer, cmW); + StringFromGUID2(&CLSID_AudioRendererCategory, buffer + lstrlenW(buffer), CHARS_IN_GUID); + lstrcatW(buffer, backslashW); + lstrcatW(buffer, name); + + mon = check_display_name(parser, buffer); + + hr = IMoniker_BindToStorage(mon, NULL, NULL, &IID_IPropertyBag, (void **)&prop_bag); + ok(hr == S_OK, "BindToStorage failed: %#x\n", hr); + + VariantInit(&var); + hr = IPropertyBag_Read(prop_bag, friendly_name, &var, NULL); + if (hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND)) + { + IPropertyBag_Release(prop_bag); + IMoniker_Release(mon); + + /* Win8+ uses the endpoint GUID instead of the device name */ + mmr = waveOutMessage((HWAVEOUT)(DWORD_PTR) i, DRV_QUERYFUNCTIONINSTANCEID, + (DWORD_PTR) endpoint, sizeof(endpoint)); + ok(!mmr, "waveOutMessage failed: %u\n", mmr); + + lstrcpyW(buffer, deviceW); + lstrcatW(buffer, cmW); + StringFromGUID2(&CLSID_AudioRendererCategory, buffer + lstrlenW(buffer), CHARS_IN_GUID); + lstrcatW(buffer, backslashW); + lstrcatW(buffer, waveW); + lstrcatW(buffer, strchrW(endpoint, '}') + 2); + + mon = check_display_name(parser, buffer); + + hr = IMoniker_BindToStorage(mon, NULL, NULL, &IID_IPropertyBag, (void **)&prop_bag); + ok(hr == S_OK, "BindToStorage failed: %#x\n", hr); + + hr = IPropertyBag_Read(prop_bag, friendly_name, &var, NULL); + } + ok(hr == S_OK, "Read failed: %#x\n", hr); + + ok(!strncmpW(name, V_BSTR(&var), lstrlenW(name)), "expected %s, got %s\n", + wine_dbgstr_w(name), wine_dbgstr_w(V_BSTR(&var))); + + VariantClear(&var); + hr = IPropertyBag_Read(prop_bag, clsidW, &var, NULL); + ok(hr == S_OK, "Read failed: %#x\n", hr); + + StringFromGUID2(&CLSID_AudioRender, buffer, CHARS_IN_GUID); + ok(!lstrcmpW(buffer, V_BSTR(&var)), "expected %s, got %s\n", + wine_dbgstr_w(buffer), wine_dbgstr_w(V_BSTR(&var))); + + VariantClear(&var); + hr = IPropertyBag_Read(prop_bag, waveoutidW, &var, NULL); + ok(hr == S_OK, "Read failed: %#x\n", hr); + + ok(V_I4(&var) == i, "expected %d, got %d\n", i, V_I4(&var)); + + IPropertyBag_Release(prop_bag); + IMoniker_Release(mon); + } + + IParseDisplayName_Release(parser); +} + START_TEST(devenum) { IBindCtx *bind_ctx = NULL; @@ -643,6 +751,7 @@ START_TEST(devenum) test_legacy_filter(); hr = DirectSoundEnumerateW(test_dsound, NULL); ok(hr == S_OK, "got %#x\n", hr); + test_waveout(); CoUninitialize(); } diff --git a/po/ar.po b/po/ar.po index 962e1ab56e4..ea96fcfa27b 100644 --- a/po/ar.po +++ b/po/ar.po @@ -2933,10 +2933,6 @@ msgid "Note: The private key for this certificate is not exportable." msgstr "ملاحظة : لا يمكن تصدير المفتاح الخاص لهذه الشهادة." #: devenum.rc:33 -msgid "Default WaveOut Device" -msgstr "الجهاز الافتراضي لإخراج الموجات" - -#: devenum.rc:34 msgid "Default MidiOut Device" msgstr "الجهاز الافتراضي لإخراج النوطات" diff --git a/po/bg.po b/po/bg.po index a515965c071..9032ab002d2 100644 --- a/po/bg.po +++ b/po/bg.po @@ -2924,10 +2924,6 @@ msgid "Note: The private key for this certificate is not exportable." msgstr "" #: devenum.rc:33 -msgid "Default WaveOut Device" -msgstr "" - -#: devenum.rc:34 msgid "Default MidiOut Device" msgstr "" diff --git a/po/ca.po b/po/ca.po index 480596891db..a71c9aaef8f 100644 --- a/po/ca.po +++ b/po/ca.po @@ -2959,10 +2959,6 @@ msgid "Note: The private key for this certificate is not exportable." msgstr "Nota: La clau privada d'aquest certificat no és exportable." #: devenum.rc:33 -msgid "Default WaveOut Device" -msgstr "Dispositiu de WaveOut per defecte" - -#: devenum.rc:34 msgid "Default MidiOut Device" msgstr "Dispositiu de MidiOut per defecte" diff --git a/po/cs.po b/po/cs.po index e3a84634389..0c2940ea5f2 100644 --- a/po/cs.po +++ b/po/cs.po @@ -2885,10 +2885,6 @@ msgid "Note: The private key for this certificate is not exportable." msgstr "Poznámka: Soukromou část klíče tohoto certifikátu nelze exportovat." #: devenum.rc:33 -msgid "Default WaveOut Device" -msgstr "Standardní zařízení WaveOut" - -#: devenum.rc:34 msgid "Default MidiOut Device" msgstr "Standardní zařízení MidiOut" diff --git a/po/da.po b/po/da.po index 37e93bbfc1e..00e8863ce93 100644 --- a/po/da.po +++ b/po/da.po @@ -2962,10 +2962,6 @@ msgid "Note: The private key for this certificate is not exportable." msgstr "Bemærk: Den private nøgle for dette certifikat kan ikke eksporteres." #: devenum.rc:33 -msgid "Default WaveOut Device" -msgstr "Standard WaveOut Enhed" - -#: devenum.rc:34 msgid "Default MidiOut Device" msgstr "Standard MidiOut Enhed" diff --git a/po/de.po b/po/de.po index 3c2ff45c2dc..5c2bc6bbfee 100644 --- a/po/de.po +++ b/po/de.po @@ -2948,10 +2948,6 @@ msgstr "" "Hinweis: Der private Schlüssel des Zertifikats kann nicht exportiert werden." #: devenum.rc:33 -msgid "Default WaveOut Device" -msgstr "Standard WaveOut-Gerät" - -#: devenum.rc:34 msgid "Default MidiOut Device" msgstr "Standard MidiOut-Gerät" diff --git a/po/el.po b/po/el.po index 51aec2e8bd8..ff23f706f0b 100644 --- a/po/el.po +++ b/po/el.po @@ -2871,10 +2871,6 @@ msgid "Note: The private key for this certificate is not exportable." msgstr "" #: devenum.rc:33 -msgid "Default WaveOut Device" -msgstr "" - -#: devenum.rc:34 msgid "Default MidiOut Device" msgstr "" diff --git a/po/en.po b/po/en.po index 9ef812a3d0a..d501b28ab07 100644 --- a/po/en.po +++ b/po/en.po @@ -2942,10 +2942,6 @@ msgid "Note: The private key for this certificate is not exportable." msgstr "Note: The private key for this certificate is not exportable." #: devenum.rc:33 -msgid "Default WaveOut Device" -msgstr "Default WaveOut Device" - -#: devenum.rc:34 msgid "Default MidiOut Device" msgstr "Default MidiOut Device" diff --git a/po/en_US.po b/po/en_US.po index bdde5ca715b..676f5ec55ed 100644 --- a/po/en_US.po +++ b/po/en_US.po @@ -2942,10 +2942,6 @@ msgid "Note: The private key for this certificate is not exportable." msgstr "Note: The private key for this certificate is not exportable." #: devenum.rc:33 -msgid "Default WaveOut Device" -msgstr "Default WaveOut Device" - -#: devenum.rc:34 msgid "Default MidiOut Device" msgstr "Default MidiOut Device" diff --git a/po/eo.po b/po/eo.po index 04df3c0f088..2118e1b0c42 100644 --- a/po/eo.po +++ b/po/eo.po @@ -2865,10 +2865,6 @@ msgid "Note: The private key for this certificate is not exportable." msgstr "" #: devenum.rc:33 -msgid "Default WaveOut Device" -msgstr "" - -#: devenum.rc:34 msgid "Default MidiOut Device" msgstr "" diff --git a/po/es.po b/po/es.po index 771043a9426..d5408acf9d7 100644 --- a/po/es.po +++ b/po/es.po @@ -2971,10 +2971,6 @@ msgid "Note: The private key for this certificate is not exportable." msgstr "Nota: La clave privada de este certificado no es exportable." #: devenum.rc:33 -msgid "Default WaveOut Device" -msgstr "Dispositivo WaveOut por defecto" - -#: devenum.rc:34 msgid "Default MidiOut Device" msgstr "Dispositivo MidiOut por defecto" diff --git a/po/fa.po b/po/fa.po index 761e149cd10..d5dcef9368b 100644 --- a/po/fa.po +++ b/po/fa.po @@ -2912,10 +2912,6 @@ msgid "Note: The private key for this certificate is not exportable." msgstr "" #: devenum.rc:33 -msgid "Default WaveOut Device" -msgstr "" - -#: devenum.rc:34 msgid "Default MidiOut Device" msgstr "" diff --git a/po/fi.po b/po/fi.po index 7c07acf83c5..d21d68d9de7 100644 --- a/po/fi.po +++ b/po/fi.po @@ -2936,10 +2936,6 @@ msgid "Note: The private key for this certificate is not exportable." msgstr "Huomio: Tämän varmenteen yksityistä avainta ei voi viedä." #: devenum.rc:33 -msgid "Default WaveOut Device" -msgstr "WaveOut-oletuslaite" - -#: devenum.rc:34 msgid "Default MidiOut Device" msgstr "MidiOut-oletuslaite" diff --git a/po/fr.po b/po/fr.po index 3a0c805150e..69802dfdb97 100644 --- a/po/fr.po +++ b/po/fr.po @@ -2963,10 +2963,6 @@ msgid "Note: The private key for this certificate is not exportable." msgstr "Note : la clé privée de ce certificat n'est pas exportable." #: devenum.rc:33 -msgid "Default WaveOut Device" -msgstr "Périphérique WaveOut par défaut" - -#: devenum.rc:34 msgid "Default MidiOut Device" msgstr "Périphérique MidiOut par défaut" diff --git a/po/he.po b/po/he.po index 21dc45b9adc..cb7af27bd97 100644 --- a/po/he.po +++ b/po/he.po @@ -2935,11 +2935,6 @@ msgstr "לתשומת לבך: המפתח הפרטי לאישור זה אינו נ #: devenum.rc:33 #, fuzzy -msgid "Default WaveOut Device" -msgstr "התקן ה־WaveOut כבררת מחדל" - -#: devenum.rc:34 -#, fuzzy msgid "Default MidiOut Device" msgstr "התקן ה־MidiOut כבררת מחדל" diff --git a/po/hi.po b/po/hi.po index 64bacefe146..6c7fd4d2ea4 100644 --- a/po/hi.po +++ b/po/hi.po @@ -2856,10 +2856,6 @@ msgid "Note: The private key for this certificate is not exportable." msgstr "" #: devenum.rc:33 -msgid "Default WaveOut Device" -msgstr "" - -#: devenum.rc:34 msgid "Default MidiOut Device" msgstr "" diff --git a/po/hr.po b/po/hr.po index 6e57ded4cdf..1f70de5e7e9 100644 --- a/po/hr.po +++ b/po/hr.po @@ -2936,10 +2936,6 @@ msgid "Note: The private key for this certificate is not exportable." msgstr "Napomena: Privatan ključ za ovaj certifikat se ne može izvesti." #: devenum.rc:33 -msgid "Default WaveOut Device" -msgstr "Podrazumijevani WaveOut uređaj" - -#: devenum.rc:34 msgid "Default MidiOut Device" msgstr "Podrazumijevani MidiOut uređaj" diff --git a/po/hu.po b/po/hu.po index 10761f89810..57b21f98891 100644 --- a/po/hu.po +++ b/po/hu.po @@ -2976,10 +2976,6 @@ msgid "Note: The private key for this certificate is not exportable." msgstr "Üzenet: A tanúsítványhoz tartozó privát kulcsok nem exportálhatóak." #: devenum.rc:33 -msgid "Default WaveOut Device" -msgstr "Alapértelmezett WaveOut eszköz" - -#: devenum.rc:34 msgid "Default MidiOut Device" msgstr "Alapértelmezett MidiOut eszköz" diff --git a/po/it.po b/po/it.po index 6cc1012a0c6..3be997e867e 100644 --- a/po/it.po +++ b/po/it.po @@ -2986,10 +2986,6 @@ msgid "Note: The private key for this certificate is not exportable." msgstr "Nota: la chiave privata per questo certificato non è esportabile." #: devenum.rc:33 -msgid "Default WaveOut Device" -msgstr "Dispositivo WaveOut predefinito" - -#: devenum.rc:34 msgid "Default MidiOut Device" msgstr "Dispositivo MidiOut predefinito" diff --git a/po/ja.po b/po/ja.po index 0e658488001..71f4650a29e 100644 --- a/po/ja.po +++ b/po/ja.po @@ -2936,10 +2936,6 @@ msgid "Note: The private key for this certificate is not exportable." msgstr "注意: この証明書の秘密鍵はエクスポートできません。" #: devenum.rc:33 -msgid "Default WaveOut Device" -msgstr "デフォルト WaveOut デバイス" - -#: devenum.rc:34 msgid "Default MidiOut Device" msgstr "デフォルト MidiOut デバイス" diff --git a/po/ko.po b/po/ko.po index 0100dd59277..33511402fb4 100644 --- a/po/ko.po +++ b/po/ko.po @@ -2941,10 +2941,6 @@ msgid "Note: The private key for this certificate is not exportable." msgstr "주의: 이 인증서를 위한 개인 키를 내보낼 수 없습니다." #: devenum.rc:33 -msgid "Default WaveOut Device" -msgstr "기본 웨이브 출력 장치" - -#: devenum.rc:34 msgid "Default MidiOut Device" msgstr "기본 미디출력 장치" diff --git a/po/lt.po b/po/lt.po index 4461050de8c..13ade8cd408 100644 --- a/po/lt.po +++ b/po/lt.po @@ -2945,10 +2945,6 @@ msgid "Note: The private key for this certificate is not exportable." msgstr "Pastaba: šio liudijimo privatusis raktas neišeksportuojamas." #: devenum.rc:33 -msgid "Default WaveOut Device" -msgstr "Numatytasis „WaveOut“ įrenginys" - -#: devenum.rc:34 msgid "Default MidiOut Device" msgstr "Numatytasis „MidiOut“ įrenginys" diff --git a/po/ml.po b/po/ml.po index ebada294e36..4f4f9484605 100644 --- a/po/ml.po +++ b/po/ml.po @@ -2856,10 +2856,6 @@ msgid "Note: The private key for this certificate is not exportable." msgstr "" #: devenum.rc:33 -msgid "Default WaveOut Device" -msgstr "" - -#: devenum.rc:34 msgid "Default MidiOut Device" msgstr "" diff --git a/po/nb_NO.po b/po/nb_NO.po index b43a5bf5542..6af0188487d 100644 --- a/po/nb_NO.po +++ b/po/nb_NO.po @@ -2947,10 +2947,6 @@ msgstr "" "Merk: Den private nøkkelen for dette sertifikatet kan ikke eksporteres." #: devenum.rc:33 -msgid "Default WaveOut Device" -msgstr "Standard enhet for lydavspilling" - -#: devenum.rc:34 msgid "Default MidiOut Device" msgstr "Standard enhet for MIDI-avspilling" diff --git a/po/nl.po b/po/nl.po index 9dbc61f6167..a0c7c822ad7 100644 --- a/po/nl.po +++ b/po/nl.po @@ -2970,10 +2970,6 @@ msgstr "" "worden." #: devenum.rc:33 -msgid "Default WaveOut Device" -msgstr "Standaardapparaat WaveOut" - -#: devenum.rc:34 msgid "Default MidiOut Device" msgstr "Standaardapparaat MidiOut" diff --git a/po/or.po b/po/or.po index 7c9dbe3ba57..d9adaaa5da9 100644 --- a/po/or.po +++ b/po/or.po @@ -2856,10 +2856,6 @@ msgid "Note: The private key for this certificate is not exportable." msgstr "" #: devenum.rc:33 -msgid "Default WaveOut Device" -msgstr "" - -#: devenum.rc:34 msgid "Default MidiOut Device" msgstr "" diff --git a/po/pa.po b/po/pa.po index 4676d0dc909..d00cbb62495 100644 --- a/po/pa.po +++ b/po/pa.po @@ -2856,10 +2856,6 @@ msgid "Note: The private key for this certificate is not exportable." msgstr "" #: devenum.rc:33 -msgid "Default WaveOut Device" -msgstr "" - -#: devenum.rc:34 msgid "Default MidiOut Device" msgstr "" diff --git a/po/pl.po b/po/pl.po index fc9b4b496d3..c27f54c4825 100644 --- a/po/pl.po +++ b/po/pl.po @@ -2959,10 +2959,6 @@ msgstr "" "eksportu." #: devenum.rc:33 -msgid "Default WaveOut Device" -msgstr "Standardowe urządzenie WaveOut" - -#: devenum.rc:34 msgid "Default MidiOut Device" msgstr "Standardowe urządzenie Device" diff --git a/po/pt_BR.po b/po/pt_BR.po index 46439e19856..56ed88a0464 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -2953,10 +2953,6 @@ msgid "Note: The private key for this certificate is not exportable." msgstr "Nota: A chave privada para este certificado não é exportável." #: devenum.rc:33 -msgid "Default WaveOut Device" -msgstr "Dispositivo padrão WaveOut" - -#: devenum.rc:34 msgid "Default MidiOut Device" msgstr "Dispositivo padrão MidiOut" diff --git a/po/pt_PT.po b/po/pt_PT.po index f228943a099..c01f272287a 100644 --- a/po/pt_PT.po +++ b/po/pt_PT.po @@ -2964,10 +2964,6 @@ msgid "Note: The private key for this certificate is not exportable." msgstr "Nota: A chave privada para este certificado não é exportável." #: devenum.rc:33 -msgid "Default WaveOut Device" -msgstr "Dispositivo pré-definido WaveOut" - -#: devenum.rc:34 msgid "Default MidiOut Device" msgstr "Dispositivo pré-definido MidiOut" diff --git a/po/rm.po b/po/rm.po index 85aed49e274..929fa0ad77f 100644 --- a/po/rm.po +++ b/po/rm.po @@ -2880,10 +2880,6 @@ msgid "Note: The private key for this certificate is not exportable." msgstr "" #: devenum.rc:33 -msgid "Default WaveOut Device" -msgstr "" - -#: devenum.rc:34 msgid "Default MidiOut Device" msgstr "" diff --git a/po/ro.po b/po/ro.po index 0bf2ab46d74..2a5d5ef0109 100644 --- a/po/ro.po +++ b/po/ro.po @@ -2933,10 +2933,6 @@ msgid "Note: The private key for this certificate is not exportable." msgstr "Notă: Cheia privată pentru acest certificat nu este exportabilă." #: devenum.rc:33 -msgid "Default WaveOut Device" -msgstr "Dispozitiv WaveOut implicit" - -#: devenum.rc:34 msgid "Default MidiOut Device" msgstr "Dispozitiv MidiOut implicit" diff --git a/po/ru.po b/po/ru.po index 6b049fe550c..53a1c1956c9 100644 --- a/po/ru.po +++ b/po/ru.po @@ -2948,10 +2948,6 @@ msgid "Note: The private key for this certificate is not exportable." msgstr "Примечание: закрытый ключ этого сертификата не экспортируемый." #: devenum.rc:33 -msgid "Default WaveOut Device" -msgstr "Звуковое устройство вывода по умолчанию" - -#: devenum.rc:34 msgid "Default MidiOut Device" msgstr "Устройство вывода MIDI по умолчанию" diff --git a/po/sk.po b/po/sk.po index fc8dd4d841d..bc2f2111c88 100644 --- a/po/sk.po +++ b/po/sk.po @@ -2890,10 +2890,6 @@ msgid "Note: The private key for this certificate is not exportable." msgstr "" #: devenum.rc:33 -msgid "Default WaveOut Device" -msgstr "" - -#: devenum.rc:34 msgid "Default MidiOut Device" msgstr "" diff --git a/po/sl.po b/po/sl.po index 311b9f71d9f..b21a47098a7 100644 --- a/po/sl.po +++ b/po/sl.po @@ -2980,10 +2980,6 @@ msgid "Note: The private key for this certificate is not exportable." msgstr "Opomba: zasebnega ključa za to potrdilo ni mogoče izvoziti." #: devenum.rc:33 -msgid "Default WaveOut Device" -msgstr "Privzeta naprava WaveOut" - -#: devenum.rc:34 msgid "Default MidiOut Device" msgstr "Privzeta naprava MidiOut" diff --git a/po/sr_RS@cyrillic.po b/po/sr_RS@cyrillic.po index 77dacaea951..de41f28a673 100644 --- a/po/sr_RS@cyrillic.po +++ b/po/sr_RS@cyrillic.po @@ -2937,10 +2937,6 @@ msgid "Note: The private key for this certificate is not exportable." msgstr "" #: devenum.rc:33 -msgid "Default WaveOut Device" -msgstr "Подразумевани WaveOut уређај" - -#: devenum.rc:34 msgid "Default MidiOut Device" msgstr "Подразумевани MidiOut уређај" diff --git a/po/sr_RS@latin.po b/po/sr_RS@latin.po index 7fb70b1d4e4..875ab6bc361 100644 --- a/po/sr_RS@latin.po +++ b/po/sr_RS@latin.po @@ -3015,10 +3015,6 @@ msgid "Note: The private key for this certificate is not exportable." msgstr "" #: devenum.rc:33 -msgid "Default WaveOut Device" -msgstr "Podrazumevani WaveOut uređaj" - -#: devenum.rc:34 msgid "Default MidiOut Device" msgstr "Podrazumevani MidiOut uređaj" diff --git a/po/sv.po b/po/sv.po index 4f1eba55f38..b5570d54eab 100644 --- a/po/sv.po +++ b/po/sv.po @@ -2943,10 +2943,6 @@ msgid "Note: The private key for this certificate is not exportable." msgstr "Obs: Den privata nyckeln för detta certifikat kan inte exporteras." #: devenum.rc:33 -msgid "Default WaveOut Device" -msgstr "Förvald WaveOut-enhet" - -#: devenum.rc:34 msgid "Default MidiOut Device" msgstr "Förvald MidiOut-enhet" diff --git a/po/te.po b/po/te.po index d21175d988d..0e8f6eee32b 100644 --- a/po/te.po +++ b/po/te.po @@ -2856,10 +2856,6 @@ msgid "Note: The private key for this certificate is not exportable." msgstr "" #: devenum.rc:33 -msgid "Default WaveOut Device" -msgstr "" - -#: devenum.rc:34 msgid "Default MidiOut Device" msgstr "" diff --git a/po/th.po b/po/th.po index 2570f59bdc6..9c2dd2de157 100644 --- a/po/th.po +++ b/po/th.po @@ -2887,10 +2887,6 @@ msgid "Note: The private key for this certificate is not exportable." msgstr "" #: devenum.rc:33 -msgid "Default WaveOut Device" -msgstr "" - -#: devenum.rc:34 msgid "Default MidiOut Device" msgstr "" diff --git a/po/tr.po b/po/tr.po index 3197a9e1ecb..d8557ada060 100644 --- a/po/tr.po +++ b/po/tr.po @@ -2943,10 +2943,6 @@ msgid "Note: The private key for this certificate is not exportable." msgstr "Not: Bu sertifika için özel anahtar aktarılamaz." #: devenum.rc:33 -msgid "Default WaveOut Device" -msgstr "Varsayılan WaveOut Aygıtı" - -#: devenum.rc:34 msgid "Default MidiOut Device" msgstr "Varsayılan MidiOut Aygıtı" diff --git a/po/uk.po b/po/uk.po index 2ce0d2af218..37ae3f640b1 100644 --- a/po/uk.po +++ b/po/uk.po @@ -2944,10 +2944,6 @@ msgstr "" "Увага: Приватний ключ для цього сертифікату не може бути експортований." #: devenum.rc:33 -msgid "Default WaveOut Device" -msgstr "Звуковий пристрій виводу за замовчуванням" - -#: devenum.rc:34 msgid "Default MidiOut Device" msgstr "Пристрій виводу Midi за замовчуванням" diff --git a/po/wa.po b/po/wa.po index 13528c1af91..c5d2830eb00 100644 --- a/po/wa.po +++ b/po/wa.po @@ -2900,10 +2900,6 @@ msgid "Note: The private key for this certificate is not exportable." msgstr "" #: devenum.rc:33 -msgid "Default WaveOut Device" -msgstr "" - -#: devenum.rc:34 msgid "Default MidiOut Device" msgstr "" diff --git a/po/wine.pot b/po/wine.pot index 07e1d7ae310..47449db0daa 100644 --- a/po/wine.pot +++ b/po/wine.pot @@ -2828,10 +2828,6 @@ msgid "Note: The private key for this certificate is not exportable." msgstr "" #: devenum.rc:33 -msgid "Default WaveOut Device" -msgstr "" - -#: devenum.rc:34 msgid "Default MidiOut Device" msgstr "" diff --git a/po/zh_CN.po b/po/zh_CN.po index 47fbf4c9c60..55e5422dcd7 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -2894,10 +2894,6 @@ msgid "Note: The private key for this certificate is not exportable." msgstr "注意：证书的私钥不可导出。" #: devenum.rc:33 -msgid "Default WaveOut Device" -msgstr "默认 WaveOut 设备" - -#: devenum.rc:34 msgid "Default MidiOut Device" msgstr "默认 MidiOut 设备" diff --git a/po/zh_TW.po b/po/zh_TW.po index e340bb0904a..75ea3cae13e 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -2906,10 +2906,6 @@ msgid "Note: The private key for this certificate is not exportable." msgstr "註記：用於這個憑證的私鑰不可匯出。" #: devenum.rc:33 -msgid "Default WaveOut Device" -msgstr "預設 WaveOut 裝置" - -#: devenum.rc:34 msgid "Default MidiOut Device" msgstr "預設 MidiOut 裝置"