wine-commits February 2015

wine-commits@winehq.org

2 participants
411 discussions

Nikolay Sivov : scrrun: Implement HashVal property for integer keys.
by Alexandre Julliard 25 Feb '15

25 Feb '15

Module: wine Branch: master Commit: 2fc2a7ae02fb5c49c5f2323f5849d497add44e96 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2fc2a7ae02fb5c49c5f2323f5… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Feb 25 00:22:00 2015 +0300 scrrun: Implement HashVal property for integer keys. --- dlls/scrrun/dictionary.c | 23 +++++++++++ dlls/scrrun/tests/dictionary.c | 90 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 113 insertions(+) diff --git a/dlls/scrrun/dictionary.c b/dlls/scrrun/dictionary.c index d615426..b5edfc6 100644 --- a/dlls/scrrun/dictionary.c +++ b/dlls/scrrun/dictionary.c @@ -23,6 +23,7 @@ #include "windef.h" #include "winbase.h" #include "ole2.h" +#include "olectl.h" #include "dispex.h" #include "scrrun.h" #include "scrrun_private.h" @@ -309,6 +310,11 @@ static DWORD get_str_hash(const WCHAR *str, CompareMethod method) return hash % 1201; } +static DWORD get_num_hash(FLOAT num) +{ + return (*((DWORD*)&num)) % 1201; +} + static HRESULT WINAPI dictionary_get_HashVal(IDictionary *iface, VARIANT *key, VARIANT *hash) { dictionary *This = impl_from_IDictionary(iface); @@ -321,6 +327,23 @@ static HRESULT WINAPI dictionary_get_HashVal(IDictionary *iface, VARIANT *key, V case VT_BSTR: V_I4(hash) = get_str_hash(V_BSTR(key), This->method); break; + case VT_UI1: + V_I4(hash) = get_num_hash(V_UI1(key)); + break; + case VT_I2: + V_I4(hash) = get_num_hash(V_I2(key)); + break; + case VT_I4: + V_I4(hash) = get_num_hash(V_I4(key)); + break; + case VT_INT: + case VT_UINT: + case VT_I1: + case VT_I8: + case VT_UI2: + case VT_UI4: + V_I4(hash) = ~0u; + return CTL_E_ILLEGALFUNCTIONCALL; default: FIXME("not implemented for type %d\n", V_VT(key)); return E_NOTIMPL; diff --git a/dlls/scrrun/tests/dictionary.c b/dlls/scrrun/tests/dictionary.c index 1cb60b6..0a168e0 100644 --- a/dlls/scrrun/tests/dictionary.c +++ b/dlls/scrrun/tests/dictionary.c @@ -22,6 +22,7 @@ #include "windows.h" #include "ole2.h" #include "oleauto.h" +#include "olectl.h" #include "dispex.h" #include "wine/test.h" @@ -143,6 +144,11 @@ static DWORD get_str_hash(const WCHAR *str, CompareMethod method) return hash % 1201; } +static DWORD get_num_hash(FLOAT num) +{ + return (*((DWORD*)&num)) % 1201; +} + static void test_hash_value(void) { /* string test data */ @@ -155,6 +161,10 @@ static void test_hash_value(void) { 0 } }; + static const int int_hash_tests[] = { + 0, -1, 100, 1, 255 + }; + IDictionary *dict; VARIANT key, hash; HRESULT hr; @@ -217,6 +227,86 @@ static void test_hash_value(void) VariantClear(&key); } + V_VT(&key) = VT_INT; + V_INT(&key) = 1; + VariantInit(&hash); + hr = IDictionary_get_HashVal(dict, &key, &hash); + ok(hr == CTL_E_ILLEGALFUNCTIONCALL || broken(hr == S_OK) /* win2k, win2k3 */, "got 0x%08x\n", hr); + ok(V_VT(&hash) == VT_I4, "got %d\n", V_VT(&hash)); + ok(V_I4(&hash) == ~0u, "got hash 0x%08x\n", V_I4(&hash)); + + V_VT(&key) = VT_UINT; + V_UINT(&key) = 1; + VariantInit(&hash); + hr = IDictionary_get_HashVal(dict, &key, &hash); + ok(hr == CTL_E_ILLEGALFUNCTIONCALL || broken(hr == S_OK) /* win2k, win2k3 */, "got 0x%08x\n", hr); + ok(V_VT(&hash) == VT_I4, "got %d\n", V_VT(&hash)); + ok(V_I4(&hash) == ~0u, "got hash 0x%08x\n", V_I4(&hash)); + + V_VT(&key) = VT_I1; + V_I1(&key) = 1; + VariantInit(&hash); + hr = IDictionary_get_HashVal(dict, &key, &hash); + ok(hr == CTL_E_ILLEGALFUNCTIONCALL || broken(hr == S_OK) /* win2k, win2k3 */, "got 0x%08x\n", hr); + ok(V_VT(&hash) == VT_I4, "got %d\n", V_VT(&hash)); + ok(V_I4(&hash) == ~0u || broken(V_I4(&hash) == 0xa1), "got hash 0x%08x\n", V_I4(&hash)); + + V_VT(&key) = VT_I8; + V_I8(&key) = 1; + VariantInit(&hash); + hr = IDictionary_get_HashVal(dict, &key, &hash); + ok(hr == CTL_E_ILLEGALFUNCTIONCALL || broken(hr == S_OK) /* win2k, win2k3 */, "got 0x%08x\n", hr); + ok(V_VT(&hash) == VT_I4, "got %d\n", V_VT(&hash)); + ok(V_I4(&hash) == ~0u, "got hash 0x%08x\n", V_I4(&hash)); + + V_VT(&key) = VT_UI2; + V_UI2(&key) = 1; + VariantInit(&hash); + hr = IDictionary_get_HashVal(dict, &key, &hash); + ok(hr == CTL_E_ILLEGALFUNCTIONCALL || broken(hr == S_OK) /* win2k, win2k3 */, "got 0x%08x\n", hr); + ok(V_VT(&hash) == VT_I4, "got %d\n", V_VT(&hash)); + ok(V_I4(&hash) == ~0u, "got hash 0x%08x\n", V_I4(&hash)); + + V_VT(&key) = VT_UI4; + V_UI4(&key) = 1; + VariantInit(&hash); + hr = IDictionary_get_HashVal(dict, &key, &hash); + ok(hr == CTL_E_ILLEGALFUNCTIONCALL || broken(hr == S_OK) /* win2k, win2k3 */, "got 0x%08x\n", hr); + ok(V_VT(&hash) == VT_I4, "got %d\n", V_VT(&hash)); + ok(V_I4(&hash) == ~0u, "got hash 0x%08x\n", V_I4(&hash)); + + for (i = 0; i < sizeof(int_hash_tests)/sizeof(int_hash_tests[0]); i++) { + DWORD expected = get_num_hash(int_hash_tests[i]); + + V_VT(&key) = VT_I2; + V_I2(&key) = int_hash_tests[i]; + VariantInit(&hash); + hr = IDictionary_get_HashVal(dict, &key, &hash); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(V_VT(&hash) == VT_I4, "got %d\n", V_VT(&hash)); + ok(V_I4(&hash) == expected, "%d: got hash 0x%08x, expected 0x%08x\n", i, V_I4(&hash), + expected); + + V_VT(&key) = VT_I4; + V_I4(&key) = int_hash_tests[i]; + VariantInit(&hash); + hr = IDictionary_get_HashVal(dict, &key, &hash); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(V_VT(&hash) == VT_I4, "got %d\n", V_VT(&hash)); + ok(V_I4(&hash) == expected, "%d: got hash 0x%08x, expected 0x%08x\n", i, V_I4(&hash), + expected); + + expected = get_num_hash((FLOAT)(BYTE)int_hash_tests[i]); + V_VT(&key) = VT_UI1; + V_UI1(&key) = int_hash_tests[i]; + VariantInit(&hash); + hr = IDictionary_get_HashVal(dict, &key, &hash); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(V_VT(&hash) == VT_I4, "got %d\n", V_VT(&hash)); + ok(V_I4(&hash) == expected, "%d: got hash 0x%08x, expected 0x%08x\n", i, V_I4(&hash), + expected); + } + IDictionary_Release(dict); }

1 0

Nikolay Sivov : scrrun: Implement HashVal property for VT_BSTR case.
by Alexandre Julliard 25 Feb '15

25 Feb '15

Module: wine Branch: master Commit: 37120e758216504276c6e44f08fa78748e38b74e URL: http://source.winehq.org/git/wine.git/?a=commit;h=37120e758216504276c6e44f0… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Feb 24 23:27:17 2015 +0300 scrrun: Implement HashVal property for VT_BSTR case. --- dlls/scrrun/dictionary.c | 37 ++++++++++++++-- dlls/scrrun/tests/Makefile.in | 2 +- dlls/scrrun/tests/dictionary.c | 97 ++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 131 insertions(+), 5 deletions(-) diff --git a/dlls/scrrun/dictionary.c b/dlls/scrrun/dictionary.c index c1122fa..d615426 100644 --- a/dlls/scrrun/dictionary.c +++ b/dlls/scrrun/dictionary.c @@ -28,6 +28,7 @@ #include "scrrun_private.h" #include "wine/debug.h" +#include "wine/unicode.h" WINE_DEFAULT_DEBUG_CHANNEL(scrrun); @@ -290,15 +291,43 @@ static HRESULT WINAPI dictionary__NewEnum(IDictionary *iface, IUnknown **ppunk) return E_NOTIMPL; } -static HRESULT WINAPI dictionary_get_HashVal(IDictionary *iface, VARIANT *Key, VARIANT *HashVal) +static DWORD get_str_hash(const WCHAR *str, CompareMethod method) { - dictionary *This = impl_from_IDictionary(iface); + DWORD hash = 0; - FIXME("(%p)->(%p %p)\n", This, Key, HashVal); + if (str) { + while (*str) { + WCHAR ch; - return E_NOTIMPL; + ch = (method == TextCompare || method == DatabaseCompare) ? tolowerW(*str) : *str; + + hash += (hash << 4) + ch; + str++; + } + } + + return hash % 1201; } +static HRESULT WINAPI dictionary_get_HashVal(IDictionary *iface, VARIANT *key, VARIANT *hash) +{ + dictionary *This = impl_from_IDictionary(iface); + + TRACE("(%p)->(%s %p)\n", This, debugstr_variant(key), hash); + + V_VT(hash) = VT_I4; + switch (V_VT(key)) + { + case VT_BSTR: + V_I4(hash) = get_str_hash(V_BSTR(key), This->method); + break; + default: + FIXME("not implemented for type %d\n", V_VT(key)); + return E_NOTIMPL; + } + + return S_OK; +} static const struct IDictionaryVtbl dictionary_vtbl = { diff --git a/dlls/scrrun/tests/Makefile.in b/dlls/scrrun/tests/Makefile.in index 5460fa4..e9eccb6 100644 --- a/dlls/scrrun/tests/Makefile.in +++ b/dlls/scrrun/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = scrrun.dll -IMPORTS = ole32 shlwapi uuid oleaut32 +IMPORTS = ole32 shlwapi uuid oleaut32 user32 C_SRCS = \ dictionary.c \ diff --git a/dlls/scrrun/tests/dictionary.c b/dlls/scrrun/tests/dictionary.c index cad387d..1cb60b6 100644 --- a/dlls/scrrun/tests/dictionary.c +++ b/dlls/scrrun/tests/dictionary.c @@ -124,6 +124,102 @@ if (0) /* crashes on native */ IDictionary_Release(dict); } +static DWORD get_str_hash(const WCHAR *str, CompareMethod method) +{ + DWORD hash = 0; + + while (*str) { + WCHAR ch; + + if (method == TextCompare || method == DatabaseCompare) + ch = PtrToInt(CharLowerW(IntToPtr(*str))); + else + ch = *str; + + hash += (hash << 4) + ch; + str++; + } + + return hash % 1201; +} + +static void test_hash_value(void) +{ + /* string test data */ + static const WCHAR str_hash_tests[][10] = { + {'a','b','c','d',0}, + {'a','B','C','d','1',0}, + {'1','2','3',0}, + {'A',0}, + {'a',0}, + { 0 } + }; + + IDictionary *dict; + VARIANT key, hash; + HRESULT hr; + unsigned i; + + hr = CoCreateInstance(&CLSID_Dictionary, NULL, CLSCTX_INPROC_SERVER|CLSCTX_INPROC_HANDLER, + &IID_IDictionary, (void**)&dict); + ok(hr == S_OK, "got 0x%08x\n", hr); + + V_VT(&key) = VT_BSTR; + V_BSTR(&key) = NULL; + VariantInit(&hash); + hr = IDictionary_get_HashVal(dict, &key, &hash); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(V_VT(&hash) == VT_I4, "got %d\n", V_VT(&hash)); + ok(V_I4(&hash) == 0, "got %d\n", V_I4(&hash)); + + for (i = 0; i < sizeof(str_hash_tests)/sizeof(str_hash_tests[0]); i++) { + DWORD expected = get_str_hash(str_hash_tests[i], BinaryCompare); + + hr = IDictionary_put_CompareMode(dict, BinaryCompare); + ok(hr == S_OK, "got 0x%08x\n", hr); + + V_VT(&key) = VT_BSTR; + V_BSTR(&key) = SysAllocString(str_hash_tests[i]); + VariantInit(&hash); + hr = IDictionary_get_HashVal(dict, &key, &hash); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(V_VT(&hash) == VT_I4, "got %d\n", V_VT(&hash)); + ok(V_I4(&hash) == expected, "%d: binary mode: got hash 0x%08x, expected 0x%08x\n", i, V_I4(&hash), + expected); + VariantClear(&key); + + expected = get_str_hash(str_hash_tests[i], TextCompare); + hr = IDictionary_put_CompareMode(dict, TextCompare); + ok(hr == S_OK, "got 0x%08x\n", hr); + + V_VT(&key) = VT_BSTR; + V_BSTR(&key) = SysAllocString(str_hash_tests[i]); + VariantInit(&hash); + hr = IDictionary_get_HashVal(dict, &key, &hash); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(V_VT(&hash) == VT_I4, "got %d\n", V_VT(&hash)); + ok(V_I4(&hash) == expected, "%d: text mode: got hash 0x%08x, expected 0x%08x\n", i, V_I4(&hash), + expected); + VariantClear(&key); + + expected = get_str_hash(str_hash_tests[i], DatabaseCompare); + hr = IDictionary_put_CompareMode(dict, DatabaseCompare); + ok(hr == S_OK, "got 0x%08x\n", hr); + + V_VT(&key) = VT_BSTR; + V_BSTR(&key) = SysAllocString(str_hash_tests[i]); + VariantInit(&hash); + hr = IDictionary_get_HashVal(dict, &key, &hash); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(V_VT(&hash) == VT_I4, "got %d\n", V_VT(&hash)); + ok(V_I4(&hash) == expected, "%d: db mode: got hash 0x%08x, expected 0x%08x\n", i, V_I4(&hash), + expected); + VariantClear(&key); + } + + IDictionary_Release(dict); +} + START_TEST(dictionary) { IDispatch *disp; @@ -142,6 +238,7 @@ START_TEST(dictionary) test_interfaces(); test_comparemode(); + test_hash_value(); CoUninitialize(); }

1 0

Andrey Gusev : x3daudio1_3: Add stub dll.
by Alexandre Julliard 25 Feb '15

25 Feb '15

Module: wine Branch: master Commit: 5be738b0498b54e0b9d110d7f3ad2ff71bd0cd46 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5be738b0498b54e0b9d110d7f… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Tue Feb 24 20:24:42 2015 +0200 x3daudio1_3: Add stub dll. --- configure | 2 ++ configure.ac | 1 + dlls/x3daudio1_3/Makefile.in | 4 ++++ dlls/x3daudio1_3/main.c | 37 +++++++++++++++++++++++++++++++++++++ dlls/x3daudio1_3/x3daudio1_3.spec | 2 ++ 5 files changed, 46 insertions(+) diff --git a/configure b/configure index b2ab2b0..273f79e 100755 --- a/configure +++ b/configure @@ -1324,6 +1324,7 @@ enable_wtsapi32 enable_wuapi enable_wuaueng enable_x3daudio1_1 +enable_x3daudio1_3 enable_x3daudio1_4 enable_x3daudio1_5 enable_x3daudio1_6 @@ -17681,6 +17682,7 @@ wine_fn_config_test dlls/wtsapi32/tests wtsapi32_test wine_fn_config_dll wuapi enable_wuapi clean wine_fn_config_dll wuaueng enable_wuaueng wine_fn_config_dll x3daudio1_1 enable_x3daudio1_1 +wine_fn_config_dll x3daudio1_3 enable_x3daudio1_3 wine_fn_config_dll x3daudio1_4 enable_x3daudio1_4 wine_fn_config_dll x3daudio1_5 enable_x3daudio1_5 wine_fn_config_dll x3daudio1_6 enable_x3daudio1_6 diff --git a/configure.ac b/configure.ac index 6eda10f..465ea4d 100644 --- a/configure.ac +++ b/configure.ac @@ -3385,6 +3385,7 @@ WINE_CONFIG_TEST(dlls/wtsapi32/tests) WINE_CONFIG_DLL(wuapi,,[clean]) WINE_CONFIG_DLL(wuaueng) WINE_CONFIG_DLL(x3daudio1_1) +WINE_CONFIG_DLL(x3daudio1_3) WINE_CONFIG_DLL(x3daudio1_4) WINE_CONFIG_DLL(x3daudio1_5) WINE_CONFIG_DLL(x3daudio1_6) diff --git a/dlls/x3daudio1_3/Makefile.in b/dlls/x3daudio1_3/Makefile.in new file mode 100644 index 0000000..631d065 --- /dev/null +++ b/dlls/x3daudio1_3/Makefile.in @@ -0,0 +1,4 @@ +MODULE = x3daudio1_3.dll + +C_SRCS = \ + main.c diff --git a/dlls/x3daudio1_3/main.c b/dlls/x3daudio1_3/main.c new file mode 100644 index 0000000..debb65c --- /dev/null +++ b/dlls/x3daudio1_3/main.c @@ -0,0 +1,37 @@ +/* + * Copyright 2015 Andrey Gusev + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "config.h" +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" + +BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, LPVOID reserved) +{ + switch (reason) + { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls(instance); + break; + } + + return TRUE; +} diff --git a/dlls/x3daudio1_3/x3daudio1_3.spec b/dlls/x3daudio1_3/x3daudio1_3.spec new file mode 100644 index 0000000..9a51f1b --- /dev/null +++ b/dlls/x3daudio1_3/x3daudio1_3.spec @@ -0,0 +1,2 @@ +@ stub X3DAudioCalculate +@ stub X3DAudioInitialize

1 0

Mark Harmstone : dsound/tests: Add a test for SetFX.
by Alexandre Julliard 25 Feb '15

25 Feb '15

Module: wine Branch: master Commit: 265ffd4368161185030b6c4761adff41a642be9c URL: http://source.winehq.org/git/wine.git/?a=commit;h=265ffd4368161185030b6c476… Author: Mark Harmstone <hellas(a)burntcomma.com> Date: Tue Feb 24 22:42:51 2015 +0000 dsound/tests: Add a test for SetFX. --- dlls/dsound/tests/dsound8.c | 169 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 169 insertions(+) diff --git a/dlls/dsound/tests/dsound8.c b/dlls/dsound/tests/dsound8.c index ad16ea7..5106cf0 100644 --- a/dlls/dsound/tests/dsound8.c +++ b/dlls/dsound/tests/dsound8.c @@ -1171,6 +1171,174 @@ static void test_COM(void) while (IUnknown_Release(unk)); } +static void test_effects(void) +{ + HRESULT rc; + LPDIRECTSOUND8 dso; + LPDIRECTSOUNDBUFFER primary, secondary; + LPDIRECTSOUNDBUFFER8 secondary8; + DSBUFFERDESC bufdesc; + WAVEFORMATEX wfx; + DSEFFECTDESC effects[2]; + DWORD resultcodes[2]; + + /* Create a DirectSound8 object */ + rc=pDirectSoundCreate8(NULL,&dso,NULL); + ok(rc==DS_OK||rc==DSERR_NODRIVER,"DirectSoundCreate8() failed: %08x\n",rc); + + if (rc!=DS_OK) + return; + + rc=IDirectSound8_SetCooperativeLevel(dso,get_hwnd(),DSSCL_PRIORITY); + ok(rc==DS_OK,"IDirectSound8_SetCooperativeLevel() failed: %08x\n", rc); + if (rc!=DS_OK) { + IDirectSound_Release(dso); + return; + } + + primary=NULL; + ZeroMemory(&bufdesc, sizeof(bufdesc)); + bufdesc.dwSize=sizeof(bufdesc); + bufdesc.dwFlags=DSBCAPS_PRIMARYBUFFER; + rc=IDirectSound8_CreateSoundBuffer(dso,&bufdesc,&primary,NULL); + ok((rc==DS_OK && primary!=NULL), + "IDirectSound8_CreateSoundBuffer() failed to create a primary buffer: " + "%08x\n",rc); + if (rc==DS_OK) { + init_format(&wfx,WAVE_FORMAT_PCM,11025,8,1); + ZeroMemory(&bufdesc, sizeof(bufdesc)); + bufdesc.dwSize=sizeof(bufdesc); + bufdesc.dwFlags=0; + bufdesc.dwBufferBytes=align(wfx.nAvgBytesPerSec*BUFFER_LEN/1000, + wfx.nBlockAlign); + bufdesc.lpwfxFormat=&wfx; + + ZeroMemory(effects, sizeof(effects)); + effects[0].dwSize=sizeof(effects[0]); + effects[0].guidDSFXClass=GUID_DSFX_STANDARD_ECHO; + effects[1].dwSize=sizeof(effects[1]); + effects[1].guidDSFXClass=GUID_NULL; + + secondary=NULL; + rc=IDirectSound8_CreateSoundBuffer(dso,&bufdesc,&secondary,NULL); + ok(rc==DS_OK && secondary!=NULL, + "IDirectSound8_CreateSoundBuffer() failed to create a secondary " + "buffer: %08x\n",rc); + + /* Call SetFX on buffer without DSBCAPS_CTRLFX */ + if (rc==DS_OK && secondary!=NULL) { + secondary8=NULL; + rc=IDirectSoundBuffer_QueryInterface(secondary,&IID_IDirectSoundBuffer8,(LPVOID*)&secondary8); + ok(rc==DS_OK,"IDirectSoundBuffer_QueryInterface(IID_IDirectSoundBuffer8) failed: %08x\n", rc); + + if (rc==DS_OK && secondary8) { + rc=IDirectSoundBuffer8_SetFX(secondary8,1,effects,resultcodes); + ok(rc==DSERR_CONTROLUNAVAIL,"IDirectSoundBuffer8_SetFX() " + "should have returned DSERR_CONTROLUNAVAIL, returned: %08x\n", rc); + + IDirectSoundBuffer8_Release(secondary8); + } + IDirectSoundBuffer_Release(secondary); + } + + secondary=NULL; + bufdesc.dwFlags=DSBCAPS_CTRLFX; + rc=IDirectSound8_CreateSoundBuffer(dso,&bufdesc,&secondary,NULL); + ok(rc==DS_OK && secondary!=NULL, + "IDirectSound8_CreateSoundBuffer() failed to create a secondary " + "buffer: %08x\n",rc); + + if (rc==DS_OK) { + secondary8=NULL; + rc=IDirectSoundBuffer_QueryInterface(secondary,&IID_IDirectSoundBuffer8,(LPVOID*)&secondary8); + ok(rc==DS_OK,"IDirectSoundBuffer_QueryInterface(IID_IDirectSoundBuffer8) failed: %08x\n", rc); + + if (rc==DS_OK && secondary8) { + LPVOID ptr1,ptr2; + DWORD bytes1,bytes2; + + /* Call SetFX with dwEffectsCount > 0 and pDSFXDesc == NULL */ + rc=IDirectSoundBuffer8_SetFX(secondary8,1,NULL,NULL); + ok(rc==E_INVALIDARG||rc==DSERR_CONTROLUNAVAIL,"IDirectSoundBuffer8_SetFX() " + "should have returned E_INVALIDARG, returned: %08x\n", rc); + + /* Call SetFX with dwEffectsCount == 0 and pDSFXDesc != NULL */ + rc=IDirectSoundBuffer8_SetFX(secondary8,0,effects,NULL); + ok(rc==E_INVALIDARG||rc==DSERR_CONTROLUNAVAIL,"IDirectSoundBuffer8_SetFX() " + "should have returned E_INVALIDARG, returned: %08x\n", rc); + + /* Call SetFX with dwEffectsCount == 0 and pdwResultCodes != NULL */ + rc=IDirectSoundBuffer8_SetFX(secondary8,0,NULL,resultcodes); + ok(rc==E_INVALIDARG||rc==DSERR_CONTROLUNAVAIL,"IDirectSoundBuffer8_SetFX() " + "should have returned E_INVALIDARG, returned: %08x\n", rc); + + rc=IDirectSoundBuffer8_Lock(secondary8,0,0,&ptr1,&bytes1,&ptr2,&bytes2,DSBLOCK_ENTIREBUFFER); + ok(rc==DS_OK,"IDirectSoundBuffer8_Lock() failed: %08x\n",rc); + + if (rc==DS_OK) { + /* Call SetFX when buffer is locked */ + rc=IDirectSoundBuffer8_SetFX(secondary8,1,effects,resultcodes); + ok(rc==DSERR_INVALIDCALL||rc==DSERR_CONTROLUNAVAIL,"IDirectSoundBuffer8_SetFX() " + "should have returned DSERR_INVALIDCALL, returned: %08x\n", rc); + + rc=IDirectSoundBuffer8_Unlock(secondary8,ptr1,bytes1,ptr2,bytes2); + ok(rc==DS_OK,"IDirectSoundBuffer8_Unlock() failed: %08x\n",rc); + } + + rc=IDirectSoundBuffer8_Play(secondary8,0,0,DSBPLAY_LOOPING); + ok(rc==DS_OK,"IDirectSoundBuffer8_Play() failed: %08x\n",rc); + + if (rc==DS_OK) { + /* Call SetFX when buffer is playing */ + rc=IDirectSoundBuffer8_SetFX(secondary8,1,effects,resultcodes); + ok(rc==DSERR_INVALIDCALL||rc==DSERR_CONTROLUNAVAIL,"IDirectSoundBuffer8_SetFX() " + "should have returned DSERR_INVALIDCALL, returned: %08x\n", rc); + + rc=IDirectSoundBuffer8_Stop(secondary8); + ok(rc==DS_OK,"IDirectSoundBuffer8_Stop() failed: %08x\n",rc); + } + + /* Call SetFX with non-existent filter */ + rc=IDirectSoundBuffer8_SetFX(secondary8,1,&effects[1],resultcodes); + ok(rc==REGDB_E_CLASSNOTREG||rc==DSERR_CONTROLUNAVAIL,"IDirectSoundBuffer8_SetFX(GUID_NULL) " + "should have returned REGDB_E_CLASSNOTREG, returned: %08x\n",rc); + if (rc!=DSERR_CONTROLUNAVAIL) { + ok(resultcodes[0]==DSFXR_UNKNOWN,"result code == %08x, expected DSFXR_UNKNOWN\n",resultcodes[0]); + } + + /* Call SetFX with standard echo */ + rc=IDirectSoundBuffer8_SetFX(secondary8,1,&effects[0],resultcodes); + ok(rc==DS_OK||rc==REGDB_E_CLASSNOTREG||rc==DSERR_CONTROLUNAVAIL, + "IDirectSoundBuffer8_SetFX(GUID_DSFX_STANDARD_ECHO) failed: %08x\n",rc); + if (rc!=DSERR_CONTROLUNAVAIL) { + ok(resultcodes[0]==DSFXR_UNKNOWN||resultcodes[0]==DSFXR_LOCHARDWARE||resultcodes[0]==DSFXR_LOCSOFTWARE, + "resultcode == %08x, expected DSFXR_UNKNOWN, DSFXR_LOCHARDWARE, or DSFXR_LOCSOFTWARE\n",resultcodes[0]); + } + + /* Call SetFX with one real filter and one fake one */ + rc=IDirectSoundBuffer8_SetFX(secondary8,2,effects,resultcodes); + ok(rc==REGDB_E_CLASSNOTREG||rc==DSERR_CONTROLUNAVAIL, + "IDirectSoundBuffer8_SetFX(GUID_DSFX_STANDARD_ECHO, GUID_NULL) " + "should have returned REGDB_E_CLASSNOTREG, returned: %08x\n",rc); + if (rc!=DSERR_CONTROLUNAVAIL) { + ok(resultcodes[0]==DSFXR_PRESENT||resultcodes[0]==DSFXR_UNKNOWN, + "resultcodes[0] == %08x, expected DSFXR_PRESENT or DSFXR_UNKNOWN\n",resultcodes[0]); + ok(resultcodes[1]==DSFXR_UNKNOWN, + "resultcodes[1] == %08x, expected DSFXR_UNKNOWN\n",resultcodes[1]); + } + + IDirectSoundBuffer8_Release(secondary8); + } + + IDirectSoundBuffer_Release(secondary); + } + + IDirectSoundBuffer_Release(primary); + } + + while (IDirectSound_Release(dso)); +} + START_TEST(dsound8) { HMODULE hDsound; @@ -1192,6 +1360,7 @@ START_TEST(dsound8) dsound8_tests(); test_hw_buffers(); test_first_device(); + test_effects(); } else skip("DirectSoundCreate8 missing - skipping all tests\n");

1 0

Akihiro Sagawa : winmm: Add .wav extension when searching for PlaySound.
by Alexandre Julliard 25 Feb '15

25 Feb '15

Module: wine Branch: master Commit: 563a4ff08ba9137dda4803a83d8937b3037fa25e URL: http://source.winehq.org/git/wine.git/?a=commit;h=563a4ff08ba9137dda4803a83… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Wed Feb 25 01:38:47 2015 +0900 winmm: Add .wav extension when searching for PlaySound. --- dlls/winmm/playsound.c | 3 ++- dlls/winmm/tests/wave.c | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/winmm/playsound.c b/dlls/winmm/playsound.c index f8bd91f..88a4c48 100644 --- a/dlls/winmm/playsound.c +++ b/dlls/winmm/playsound.c @@ -55,11 +55,12 @@ static HMMIO get_mmioFromFile(LPCWSTR lpszName) HMMIO ret; WCHAR buf[256]; LPWSTR dummy; + static const WCHAR dotwav[] = {'.','w','a','v',0}; ret = mmioOpenW((LPWSTR)lpszName, NULL, MMIO_ALLOCBUF | MMIO_READ | MMIO_DENYWRITE); if (ret != 0) return ret; - if (SearchPathW(NULL, lpszName, NULL, sizeof(buf)/sizeof(buf[0]), buf, &dummy)) + if (SearchPathW(NULL, lpszName, dotwav, sizeof(buf)/sizeof(buf[0]), buf, &dummy)) { return mmioOpenW(buf, NULL, MMIO_ALLOCBUF | MMIO_READ | MMIO_DENYWRITE); diff --git a/dlls/winmm/tests/wave.c b/dlls/winmm/tests/wave.c index 2ffbe17..e0232e7 100644 --- a/dlls/winmm/tests/wave.c +++ b/dlls/winmm/tests/wave.c @@ -1676,7 +1676,7 @@ static void test_PlaySound(void) /* no extensions */ *exts = '\0'; br = PlaySoundA(temp, NULL, SND_FILENAME | SND_NODEFAULT); - todo_wine ok(br, "PlaySound failed, got %d\n", br); + ok(br, "PlaySound failed, got %d\n", br); /* ends with a dot */ strcpy(exts, ".");

1 0

Akihiro Sagawa : winmm/tests: Add tests for PlaySound().
by Alexandre Julliard 25 Feb '15

25 Feb '15

Module: wine Branch: master Commit: e808fb196253b5d326af45c95f8ef5a5ef9c2483 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e808fb196253b5d326af45c95… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Wed Feb 25 01:38:46 2015 +0900 winmm/tests: Add tests for PlaySound(). --- dlls/winmm/tests/wave.c | 88 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 88 insertions(+) diff --git a/dlls/winmm/tests/wave.c b/dlls/winmm/tests/wave.c index 4dcc577..2ffbe17 100644 --- a/dlls/winmm/tests/wave.c +++ b/dlls/winmm/tests/wave.c @@ -1599,10 +1599,98 @@ static void test_fragmentsize(void) CloseHandle(hevent); } +static void create_wav_file(char *temp_file) +{ + WAVEFORMATEX format; + HMMIO h; + MMCKINFO riff_chunk, chunk; + MMRESULT rc; + LONG written; + DWORD length; + char *buffer; + + format.wFormatTag=WAVE_FORMAT_PCM; + format.cbSize = 0; + format.nChannels=1; + format.wBitsPerSample=8; + format.nSamplesPerSec=8000; + format.nBlockAlign=format.nChannels*format.wBitsPerSample/8; + format.nAvgBytesPerSec=format.nSamplesPerSec*format.nBlockAlign; + + h = mmioOpenA(temp_file, NULL, MMIO_ALLOCBUF | MMIO_WRITE | MMIO_CREATE); + ok(h != NULL, "Can't open temp_file\n"); + + riff_chunk.fccType = mmioFOURCC('W','A','V','E'); + rc = mmioCreateChunk(h, &riff_chunk, MMIO_CREATERIFF); + ok(rc == MMSYSERR_NOERROR, "mmioCreateChunk failed, got %u\n", rc); + + chunk.ckid = mmioFOURCC('f','m','t',' '); + rc = mmioCreateChunk(h, &chunk, 0); + ok(rc == MMSYSERR_NOERROR, "mmioCreateChunk failed, got %u\n", rc); + written = mmioWrite(h, (char*)&format, sizeof(format)); + ok(written == sizeof(format), "mmioWrite failed, got %d\n", written); + rc = mmioAscend(h, &chunk, 0); + ok(rc == MMSYSERR_NOERROR, "mmioAscend failed, got %d\n", rc); + + chunk.ckid = mmioFOURCC('d','a','t','a'); + rc = mmioCreateChunk(h, &chunk, 0); + ok(rc == MMSYSERR_NOERROR, "mmioCreateChunk failed, got %u\n", rc); + buffer = wave_generate_silence(&format, .1, &length); + written = mmioWrite(h, buffer, length); + ok(written == length, "mmioWrite failed, got %d\n", written); + rc = mmioAscend(h, &chunk, 0); + ok(rc == MMSYSERR_NOERROR, "mmioAscend failed, got %d\n", rc); + HeapFree(GetProcessHeap(), 0, buffer); + + rc = mmioAscend(h, &riff_chunk, 0); + ok(rc == MMSYSERR_NOERROR, "mmioAscend failed, got %d\n", rc); + + rc = mmioClose(h, 0); + ok(rc == MMSYSERR_NOERROR, "mmioClose failed, got %u\n", rc); +} + +static void test_PlaySound(void) +{ + BOOL br; + char test_file[MAX_PATH], temp[MAX_PATH], *exts; + + if(waveOutGetNumDevs() == 0) { + skip("No output devices available\n"); + return; + } + + GetTempPathA(sizeof(test_file), test_file); + strcat(test_file, "mysound.wav"); + create_wav_file(test_file); + + br = PlaySoundA(test_file, NULL, SND_FILENAME | SND_NODEFAULT); + ok(br, "PlaySound failed, got %d\n", br); + + /* SND_ALIAS fallbacks to SND_FILENAME */ + br = PlaySoundA(test_file, NULL, SND_ALIAS | SND_NODEFAULT); + ok(br, "PlaySound failed, got %d\n", br); + + strcpy(temp, test_file); + exts = strrchr(temp, '.'); + + /* no extensions */ + *exts = '\0'; + br = PlaySoundA(temp, NULL, SND_FILENAME | SND_NODEFAULT); + todo_wine ok(br, "PlaySound failed, got %d\n", br); + + /* ends with a dot */ + strcpy(exts, "."); + br = PlaySoundA(temp, NULL, SND_FILENAME | SND_NODEFAULT); + ok(!br || broken(br), "PlaySound succeeded, got %d\n", br); + + DeleteFileA(test_file); +} + START_TEST(wave) { test_multiple_waveopens(); wave_out_tests(); test_sndPlaySound(); test_fragmentsize(); + test_PlaySound(); }

1 0

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard 25 Feb '15

25 Feb '15

Module: wine Branch: master Commit: ea01855049faaf09096a72914886a9ef4ee82912 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ea01855049faaf09096a72914… Author: Aurimas Fišeras <aurimas(a)members.fsf.org> Date: Tue Feb 24 19:25:00 2015 +0200 po: Update Lithuanian translation. --- po/lt.po | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/po/lt.po b/po/lt.po index 87c8616..baa1bc9 100644 --- a/po/lt.po +++ b/po/lt.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2015-02-23 22:54+0300\n" +"PO-Revision-Date: 2015-02-24 19:18+0300\n" "Last-Translator: Aurimas Fišeras <aurimas(a)members.fsf.org>\n" "Language-Team: komp_lt(a)konf.lt\n" "Language: Lithuanian\n" @@ -3142,10 +3142,8 @@ msgid "&View Source" msgstr "Pirminis &tekstas" #: hhctrl.rc:83 -#, fuzzy -#| msgid "Properties" msgid "Proper&ties" -msgstr "Savybės" +msgstr "Savy&bės" #: hhctrl.rc:87 shdoclc.rc:79 shdoclc.rc:93 shdoclc.rc:117 shdoclc.rc:159 #: shdoclc.rc:183 user32.rc:60 wordpad.rc:104

1 0

Akihiro Sagawa : po: Update Japanese translation.
by Alexandre Julliard 25 Feb '15

25 Feb '15

Module: wine Branch: master Commit: 8a3faa98b2419670e6a93343cd0baf5a68aef604 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8a3faa98b2419670e6a93343c… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Wed Feb 25 01:38:49 2015 +0900 po: Update Japanese translation. --- po/ja.po | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/po/ja.po b/po/ja.po index 597fcbd..9f41977 100644 --- a/po/ja.po +++ b/po/ja.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2015-02-05 00:17+0900\n" +"PO-Revision-Date: 2015-02-25 00:13+0900\n" "Last-Translator: Akihiro Sagawa <sagawa.aki(a)gmail.com>\n" "Language-Team: 日本語 <>\n" "Language: Japanese\n" @@ -11476,7 +11476,7 @@ msgid "" "REG ADD key_name [/v value_name | /ve] [/t type] [/s separator] [/d data] [/" "f]\n" msgstr "" -"REG ADD キー名 [/v 値名 | /ve] [/t type] [/s セパレータ] [/d データ] [/f]\n" +"REG ADD キー名 [/v 値名 | /ve] [/t 種類] [/s セパレータ] [/d データ] [/f]\n" #: reg.rc:32 msgid "REG DELETE key_name [/v value_name | /ve | /va] [/f]\n" @@ -11499,10 +11499,8 @@ msgid "Error: Invalid command line parameters\n" msgstr "エラー: コマンドライン引数が無効です\n" #: reg.rc:37 -#, fuzzy -#| msgid "Error: Unable to add keys to remote machine\n" msgid "Error: Unable to access remote machine\n" -msgstr "エラー: リモートマシンにキーを追加できませんでした\n" +msgstr "エラー: リモートマシンにアクセスできませんでした\n" #: reg.rc:38 msgid "" @@ -11510,10 +11508,8 @@ msgid "" msgstr "エラー: システムは指定されたキーまたは値を見つけられませんでした\n" #: reg.rc:39 -#, fuzzy -#| msgid "Unsupported type.\n" msgid "Error: Unsupported type\n" -msgstr "サポートされていない種類です。\n" +msgstr "エラー: サポートされていない種類です\n" #: regedit.rc:34 msgid "&Registry"

1 0

Julian Rüger : po: Update German translation.
by Alexandre Julliard 25 Feb '15

25 Feb '15

Module: wine Branch: master Commit: ab21c7ca77f319640dff27cf2eb9bf5bb7b92b63 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ab21c7ca77f319640dff27cf2… Author: Julian Rüger <jr98(a)gmx.net> Date: Tue Feb 24 14:55:33 2015 +0100 po: Update German translation. --- po/de.po | 79 +++++++++++++++++++++++++++++++--------------------------------- 1 file changed, 38 insertions(+), 41 deletions(-) diff --git a/po/de.po b/po/de.po index f99a105..c5ae822 100644 --- a/po/de.po +++ b/po/de.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2015-02-05 22:22+0100\n" +"PO-Revision-Date: 2015-02-24 14:54+0100\n" "Last-Translator: Julian Rüger\n" "Language-Team: none\n" "Language: German\n" @@ -4526,31 +4526,31 @@ msgstr "Ungültiger Schlüssel.\n" #: winerror.mc:1071 msgid "Can't open registry key.\n" -msgstr "Kann Registry-Schlüssel nicht öffnen.\n" +msgstr "Registrierungsschlüssel konnte nicht geöffnet werden.\n" #: winerror.mc:1076 msgid "Can't read registry key.\n" -msgstr "Kann Registry-Schlüssel nicht lesen.\n" +msgstr "Registrierungsschlüssel konnte nicht gelesen werden.\n" #: winerror.mc:1081 msgid "Can't write registry key.\n" -msgstr "Kann Registry-Schlüssel nicht schreiben.\n" +msgstr "Registrierungsschlüssel konnte nicht geschrieben werden.\n" #: winerror.mc:1086 msgid "Registry has been recovered.\n" -msgstr "Registry wurde wiederhergestellt.\n" +msgstr "Registrierung wurde wiederhergestellt.\n" #: winerror.mc:1091 msgid "Registry is corrupt.\n" -msgstr "Registry ist beschädigt.\n" +msgstr "Registrierung ist beschädigt.\n" #: winerror.mc:1096 msgid "I/O to registry failed.\n" -msgstr "E/A zu Registry fehlgeschlagen.\n" +msgstr "E/A zur Registrierung fehlgeschlagen.\n" #: winerror.mc:1101 msgid "Not registry file.\n" -msgstr "Keine Registry-Datei.\n" +msgstr "Keine Registrierungsdatei.\n" #: winerror.mc:1106 msgid "Key deleted.\n" @@ -4558,11 +4558,11 @@ msgstr "Schlüssel gelöscht.\n" #: winerror.mc:1111 msgid "No registry log space.\n" -msgstr "Kein Speicher für Registry-Protokoll.\n" +msgstr "Kein Speicher für Registrierungs-Log.\n" #: winerror.mc:1116 msgid "Registry key has subkeys.\n" -msgstr "Registry-Schlüssel hat Unterschlüssel.\n" +msgstr "Registrierungsschlüssel hat Unterschlüssel.\n" #: winerror.mc:1121 msgid "Subkey must be volatile.\n" @@ -4606,7 +4606,7 @@ msgstr "Dienst ist deaktiviert.\n" #: winerror.mc:1171 msgid "Circular dependency.\n" -msgstr "Zirkulare Abhängigkeit.\n" +msgstr "Zirkuläre Abhängigkeit.\n" #: winerror.mc:1176 msgid "Service does not exist.\n" @@ -4634,7 +4634,7 @@ msgstr "Datenbank existiert nicht.\n" #: winerror.mc:1206 msgid "Service-specific error.\n" -msgstr "Dienst-spezifischer Fehler.\n" +msgstr "Dienstspezifischer Fehler.\n" #: winerror.mc:1211 msgid "Process aborted.\n" @@ -11001,7 +11001,7 @@ msgstr "&Systemkonfiguration" #: oleview.rc:36 msgid "&Run the Registry Editor" -msgstr "&Registry-Editor ausführen" +msgstr "&Registrierungs-Editor ausführen" #: oleview.rc:40 msgid "&Object" @@ -11112,7 +11112,7 @@ msgid "" "These settings change only registry values.\n" "They have no effect on Wine performance." msgstr "" -"Diese Einstellungen ändern nur Registry-Werte.\n" +"Diese Einstellungen ändern nur Registrierungswerte.\n" "Sie haben keinen Einfluss auf die Wine-Performance." #: oleview.rc:181 @@ -11181,7 +11181,7 @@ msgstr "Maschinenweite Distributed COM Einstellungen ändern" #: oleview.rc:109 msgid "Run the Wine registry editor" -msgstr "Wine-Registry-Editor ausführen" +msgstr "Wine-Registrierungs-Editor ausführen" #: oleview.rc:110 msgid "Quit the application. Prompts to save changes" @@ -11584,10 +11584,8 @@ msgid "Error: Invalid command line parameters\n" msgstr "Fehler: Ungültige Befehlszeilenargumente\n" #: reg.rc:37 -#, fuzzy -#| msgid "Error: Unable to add keys to remote machine\n" msgid "Error: Unable to access remote machine\n" -msgstr "Fehler: Konnte Schlüssel nicht zum Remoterechner hinzufügen\n" +msgstr "Fehler: Auf den Remoterechner kann nicht zugegriffen werden\n" #: reg.rc:38 msgid "" @@ -11596,22 +11594,20 @@ msgstr "" "Fehler: Der angegebene Schlüssel oder Wert konnte nicht gefunden werden\n" #: reg.rc:39 -#, fuzzy -#| msgid "Unsupported type.\n" msgid "Error: Unsupported type\n" -msgstr "Nicht unterstützter Typ.\n" +msgstr "Fehler: Nicht unterstützter Typ\n" #: regedit.rc:34 msgid "&Registry" -msgstr "&Registry" +msgstr "&Registrierung" #: regedit.rc:36 msgid "&Import Registry File..." -msgstr "Registry &importieren..." +msgstr "Registrierungsdatei &importieren..." #: regedit.rc:37 msgid "&Export Registry File..." -msgstr "Registry &exportieren..." +msgstr "Registrierungsdatei &exportieren..." #: regedit.rc:49 regedit.rc:100 msgid "&Key" @@ -11667,7 +11663,7 @@ msgstr "Von den Favoriten &löschen..." #: regedit.rc:82 msgid "&About Registry Editor" -msgstr "&Über Registry Editor" +msgstr "&Über den Registrierungs-Editor" #: regedit.rc:91 msgid "Modify Binary Data..." @@ -11675,7 +11671,7 @@ msgstr "Binäre Daten ändern..." #: regedit.rc:218 msgid "Export registry" -msgstr "Registry &exportieren" +msgstr "Registrierung &exportieren" #: regedit.rc:220 msgid "S&elected branch:" @@ -11711,7 +11707,7 @@ msgstr "Zu den Favoriten hinzufügen" #: regedit.rc:245 regedit.rc:256 msgid "Name:" -msgstr "NAME:" +msgstr "Name:" #: regedit.rc:253 msgid "Remove Favorite" @@ -11719,7 +11715,7 @@ msgstr "Von den Favoriten entfernen" #: regedit.rc:264 msgid "Edit String" -msgstr "Zeichenfolge ändern" +msgstr "Zeichenfolge editieren" #: regedit.rc:267 regedit.rc:280 regedit.rc:296 regedit.rc:309 msgid "Value name:" @@ -11755,7 +11751,7 @@ msgstr "Mehrteilige Zeichenfolge editieren" #: regedit.rc:137 msgid "Contains commands for working with the whole registry" -msgstr "Befehle zum Bearbeiten der ganzen Registry" +msgstr "Befehle zum Bearbeiten der ganzen Registrierung" #: regedit.rc:138 msgid "Contains commands for editing values or keys" @@ -11772,7 +11768,8 @@ msgstr "Befehle zum Zugriff auf häufig benutzte Schlüssel" #: regedit.rc:141 msgid "" "Contains commands for displaying help and information about registry editor" -msgstr "Befehle zum Anzeigen der Hilfe oder Informationen über das Programm" +msgstr "" +"Befehle zum Anzeigen der Hilfe oder von Informationen über das Programm" #: regedit.rc:142 msgid "Contains commands for creating new keys or values" @@ -11784,23 +11781,23 @@ msgstr "Daten" #: regedit.rc:132 msgid "Registry Editor" -msgstr "Registry-Editor" +msgstr "Registrierungs-Editor" #: regedit.rc:194 msgid "Import Registry File" -msgstr "Registry-Datei importieren" +msgstr "Registrierungsdatei importieren" #: regedit.rc:195 msgid "Export Registry File" -msgstr "Registry-Datei exportieren" +msgstr "Registrierungsdatei exportieren" #: regedit.rc:196 msgid "Registry files (*.reg)" -msgstr "Registry-Dateien (*.reg)" +msgstr "Registrierungsdateien (*.reg)" #: regedit.rc:197 msgid "Win9x/NT4 Registry files (REGEDIT4)" -msgstr "Win9x/NT4 Registry-Dateien (REGEDIT4)" +msgstr "Win9x/NT4 Registrierungsdateien (REGEDIT4)" #: regedit.rc:204 msgid "(Default)" @@ -11820,7 +11817,7 @@ msgstr "(unbekannt %d)" #: regedit.rc:163 msgid "Quits the registry editor" -msgstr "Beendet den Registry-Editor" +msgstr "Beendet den Registrierungs-Editor" #: regedit.rc:164 msgid "Adds keys to the favorites list" @@ -13207,11 +13204,11 @@ msgstr "Darstellung" #: winecfg.rc:287 msgid "&Theme:" -msgstr "&Motiv:" +msgstr "&Thema:" #: winecfg.rc:289 msgid "&Install theme..." -msgstr "Motiv &installieren..." +msgstr "Thema &installieren..." #: winecfg.rc:294 msgid "It&em:" @@ -13247,7 +13244,7 @@ msgstr "&Erweitert ausblenden" #: winecfg.rc:39 msgid "(No Theme)" -msgstr "(Kein Motiv)" +msgstr "(Kein Thema)" #: winecfg.rc:40 msgid "Graphics" @@ -13271,11 +13268,11 @@ msgstr "Wine-Konfiguration" #: winecfg.rc:46 msgid "Theme files (*.msstyles; *.theme)" -msgstr "Motiv-Dateien (*.msstyles; *.theme)" +msgstr "Themen-Dateien (*.msstyles; *.theme)" #: winecfg.rc:47 msgid "Select a theme file" -msgstr "Motiv-Datei auswählen" +msgstr "Themen-Datei auswählen" #: winecfg.rc:48 msgid "Folder"

1 0

Frédéric Delanoy : French translation for release 1.7.37
by Jeremy Newman 25 Feb '15

25 Feb '15

Module: website Branch: master Commit: 2d203a307921b6a1a772f45d5a7e2a3df57a08c7 URL: http://source.winehq.org/git/website.git/?a=commit;h=2d203a307921b6a1a772f4… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Wed Feb 25 15:28:39 2015 +0100 French translation for release 1.7.37 --- news/fr/2015022001.xml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/news/fr/2015022001.xml b/news/fr/2015022001.xml new file mode 100644 index 0000000..01130b1 --- /dev/null +++ b/news/fr/2015022001.xml @@ -0,0 +1,15 @@ +<news> +<date>20 février 2015</date> +<title>Sortie de Wine 1.7.37</title> +<body> + La version de développement 1.7.37 de Wine est disponible. + <a href="{$root}/announce/1.7.37">Nouveautés</a> de cette version : +<ul> + <li>Notifications de changement d'interface.</li> + <li>Prise en charge du codage UTF-7.</li> + <li>Plusieurs correctifs graphiques pour les contrôles utilisant un thème.</li> + <li>Wininet à présent implémenté au dessus des sockets Win32.</li> + <li>Diverses corrections de bugs.</li> +</ul> +Le <a href="http://prdownloads.sourceforge.net/wine/wine-1.7.37.tar.bz2">code source</a> est disponible dès à présent. Les paquets binaires sont en cours de construction, et apparaîtront sous peu sur leurs <a href="{$root}/download">sites de téléchargement</a> respectifs. +</body></news>

1 0

← Newer
1
...
5
6
7
8
9
10
11
...
42
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits February 2015