February 2015 - Wine-commits

Piotr Caban : msvcp90: Added time_get<char>::do_date_order implementation.
by Alexandre Julliard 25 Feb '15

25 Feb '15

Module: wine Branch: master Commit: 69ed143be6580ba4a50a37f1baad5f6f23bf9600 URL: http://source.winehq.org/git/wine.git/?a=commit;h=69ed143be6580ba4a50a37f1b… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Feb 25 15:34:10 2015 +0100 msvcp90: Added time_get<char>::do_date_order implementation. --- dlls/msvcp90/locale.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msvcp90/locale.c b/dlls/msvcp90/locale.c index 5237e09..397d8c5 100644 --- a/dlls/msvcp90/locale.c +++ b/dlls/msvcp90/locale.c @@ -9471,8 +9471,8 @@ DEFINE_THISCALL_WRAPPER(time_get_char_do_date_order, 4) /* virtual */ #endif dateorder __thiscall time_get_char_do_date_order(const time_get_char *this) { - FIXME("(%p) stub\n", this); - return 0; + TRACE("(%p)\n", this); + return this->dateorder; } /* ?date_order@?$time_get(a)DV?$istreambuf_iterator(a)DU?$char_traits(a)D@std@@@std@@@std@@QBE?AW4dateorder(a)time_base@2(a)XZ */

1 0

Piotr Caban : msvcp: Sync spec files.
by Alexandre Julliard 25 Feb '15

25 Feb '15

Module: wine Branch: master Commit: 1fdd692ebd237dd45f5f7dbb383f90cb61318c32 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1fdd692ebd237dd45f5f7dbb3… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Feb 25 15:34:16 2015 +0100 msvcp: Sync spec files. --- dlls/msvcp100/msvcp100.spec | 88 ++++++++++++++++++------------------- dlls/msvcp110/msvcp110.spec | 84 +++++++++++++++++------------------ dlls/msvcp120/msvcp120.spec | 84 +++++++++++++++++------------------ dlls/msvcp120_app/msvcp120_app.spec | 84 +++++++++++++++++------------------ dlls/msvcp70/msvcp70.spec | 76 ++++++++++++++++---------------- dlls/msvcp71/msvcp71.spec | 80 ++++++++++++++++----------------- dlls/msvcp80/msvcp80.spec | 84 +++++++++++++++++------------------ 7 files changed, 290 insertions(+), 290 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1fdd692ebd237dd45f5f7…

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

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

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

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 for floating point keys.
by Alexandre Julliard 25 Feb '15

25 Feb '15

Module: wine Branch: master Commit: 08900265a0aaba4c658f359acd90398e1aac8a8c URL: http://source.winehq.org/git/wine.git/?a=commit;h=08900265a0aaba4c658f359ac… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Feb 25 08:11:15 2015 +0300 scrrun: Implement HashVal for floating point keys. --- dlls/scrrun/dictionary.c | 19 ++++++++ dlls/scrrun/tests/dictionary.c | 104 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 123 insertions(+) diff --git a/dlls/scrrun/dictionary.c b/dlls/scrrun/dictionary.c index b5edfc6..a33e1de 100644 --- a/dlls/scrrun/dictionary.c +++ b/dlls/scrrun/dictionary.c @@ -18,6 +18,8 @@ #define COBJMACROS #include "config.h" +#include "wine/port.h" + #include <stdarg.h> #include "windef.h" @@ -336,6 +338,23 @@ static HRESULT WINAPI dictionary_get_HashVal(IDictionary *iface, VARIANT *key, V case VT_I4: V_I4(hash) = get_num_hash(V_I4(key)); break; + case VT_R4: + case VT_R8: + { + FLOAT flt = V_VT(key) == VT_R4 ? V_R4(key) : V_R8(key); + + if (isinf(flt)) + { + V_I4(hash) = 0; + break; + } + else if (!isnan(flt)) + { + V_I4(hash) = get_num_hash(flt); + break; + } + /* fallthrough on NAN */ + } case VT_INT: case VT_UINT: case VT_I1: diff --git a/dlls/scrrun/tests/dictionary.c b/dlls/scrrun/tests/dictionary.c index 0a168e0..0c3a92c 100644 --- a/dlls/scrrun/tests/dictionary.c +++ b/dlls/scrrun/tests/dictionary.c @@ -149,6 +149,29 @@ static DWORD get_num_hash(FLOAT num) return (*((DWORD*)&num)) % 1201; } +typedef union +{ + struct + { + unsigned int m : 23; + unsigned int exp_bias : 8; + unsigned int sign : 1; + } i; + float f; +} R4_FIELDS; + +typedef union +{ + struct + { + unsigned int m_lo : 32; /* 52 bits of precision */ + unsigned int m_hi : 20; + unsigned int exp_bias : 11; /* bias == 1023 */ + unsigned int sign : 1; + } i; + double d; +} R8_FIELDS; + static void test_hash_value(void) { /* string test data */ @@ -165,8 +188,14 @@ static void test_hash_value(void) 0, -1, 100, 1, 255 }; + static const FLOAT float_hash_tests[] = { + 0.0, -1.0, 100.0, 1.0, 255.0, 1.234 + }; + IDictionary *dict; VARIANT key, hash; + R8_FIELDS fx8; + R4_FIELDS fx4; HRESULT hr; unsigned i; @@ -307,6 +336,81 @@ static void test_hash_value(void) expected); } + /* nan */ + fx4.f = 10.0; + fx4.i.exp_bias = 0xff; + + V_VT(&key) = VT_R4; + V_R4(&key) = fx4.f; + 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) == 0 /* win2k */ || + V_I4(&hash) == 0x1f4 /* vista, win2k8 */), "got hash 0x%08x\n", V_I4(&hash)); + + /* inf */ + fx4.f = 10.0; + fx4.i.m = 0; + fx4.i.exp_bias = 0xff; + + V_VT(&key) = VT_R4; + V_R4(&key) = fx4.f; + V_I4(&hash) = 10; + 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 hash 0x%08x\n", V_I4(&hash)); + + /* nan */ + fx8.d = 10.0; + fx8.i.exp_bias = 0x7ff; + + V_VT(&key) = VT_R8; + V_R8(&key) = fx8.d; + 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) == 0 /* win2k */ || + V_I4(&hash) == 0x1f4 /* vista, win2k8 */), "got hash 0x%08x\n", V_I4(&hash)); + + /* inf */ + fx8.d = 10.0; + fx8.i.m_lo = 0; + fx8.i.m_hi = 0; + fx8.i.exp_bias = 0x7ff; + + V_VT(&key) = VT_R8; + V_R8(&key) = fx8.d; + V_I4(&hash) = 10; + 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 hash 0x%08x\n", V_I4(&hash)); + + for (i = 0; i < sizeof(float_hash_tests)/sizeof(float_hash_tests[0]); i++) { + DWORD expected = get_num_hash(float_hash_tests[i]); + + V_VT(&key) = VT_R4; + V_R4(&key) = float_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_R8; + V_R8(&key) = float_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 : services: Make ChangeServiceConfig2W() rpc call compatible with native one.
by Alexandre Julliard 25 Feb '15

25 Feb '15

Module: wine Branch: master Commit: 3c186a65d3e52428924ba3e513961b0c569e567c URL: http://source.winehq.org/git/wine.git/?a=commit;h=3c186a65d3e52428924ba3e51… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Feb 25 08:57:20 2015 +0300 services: Make ChangeServiceConfig2W() rpc call compatible with native one. --- dlls/advapi32/service.c | 6 +++++- include/wine/svcctl.idl | 40 +++++++++++++++++++++++++++++++--------- programs/services/rpc.c | 20 ++++++++++---------- 3 files changed, 46 insertions(+), 20 deletions(-) diff --git a/dlls/advapi32/service.c b/dlls/advapi32/service.c index 23ff2f0..e0f7312 100644 --- a/dlls/advapi32/service.c +++ b/dlls/advapi32/service.c @@ -2155,7 +2155,11 @@ BOOL WINAPI ChangeServiceConfig2W( SC_HANDLE hService, DWORD dwInfoLevel, __TRY { - err = svcctl_ChangeServiceConfig2W( hService, dwInfoLevel, lpInfo ); + SC_RPC_CONFIG_INFOW info; + + info.dwInfoLevel = dwInfoLevel; + info.descr = lpInfo; + err = svcctl_ChangeServiceConfig2W( hService, info ); } __EXCEPT(rpc_filter) { diff --git a/include/wine/svcctl.idl b/include/wine/svcctl.idl index f261702..b5a8c4d 100644 --- a/include/wine/svcctl.idl +++ b/include/wine/svcctl.idl @@ -114,6 +114,18 @@ typedef struct _SERVICE_FAILURE_ACTIONSW { [size_is(cActions)] SC_ACTION *lpsaActions; } SERVICE_FAILURE_ACTIONSW,*LPSERVICE_FAILURE_ACTIONSW; +typedef struct _SERVICE_DELAYED_AUTO_START_INFO { + BOOL fDelayedAutostart; +} SERVICE_DELAYED_AUTO_START_INFO; + +typedef struct _SERVICE_FAILURE_ACTIONS_FLAG { + BOOL fFailureActionsOnNonCrashFailures; +} SERVICE_FAILURE_ACTIONS_FLAG; + +typedef struct _SERVICE_SID_INFO { + DWORD dwServiceSidType; +} SERVICE_SID_INFO; + typedef struct _SERVICE_PRESHUTDOWN_INFO { DWORD dwPreshutdownTimeout; } SERVICE_PRESHUTDOWN_INFO,*LPSERVICE_PRESHUTDOWN_INFO; @@ -134,12 +146,23 @@ typedef struct _ENUM_SERVICE_STATUSW { cpp_quote("#endif") -typedef [switch_type(DWORD)] union -{ - [case (SERVICE_CONFIG_DESCRIPTION)] SERVICE_DESCRIPTIONW descr; - [case (SERVICE_CONFIG_FAILURE_ACTIONS)] SERVICE_FAILURE_ACTIONSW actions; - [case (SERVICE_CONFIG_PRESHUTDOWN_INFO)] SERVICE_PRESHUTDOWN_INFO preshutdown; -} SERVICE_CONFIG2W; +typedef struct _SERVICE_RPC_REQUIRED_PRIVILEGES_INFO { + DWORD cbRequiredPrivileges; + [size_is(cbRequiredPrivileges)] BYTE *pRequiredPrivileges; +} SERVICE_RPC_REQUIRED_PRIVILEGES_INFO; + +typedef struct _SC_RPC_CONFIG_INFOW { + DWORD dwInfoLevel; + [switch_is(dwInfoLevel)] union { + [case(SERVICE_CONFIG_DESCRIPTION)] SERVICE_DESCRIPTIONW *descr; + [case(SERVICE_CONFIG_FAILURE_ACTIONS)] SERVICE_FAILURE_ACTIONSW *actions; + [case(SERVICE_CONFIG_DELAYED_AUTO_START_INFO)] SERVICE_DELAYED_AUTO_START_INFO *delayedstart; + [case(SERVICE_CONFIG_FAILURE_ACTIONS_FLAG)] SERVICE_FAILURE_ACTIONS_FLAG *actionsflag; + [case(SERVICE_CONFIG_SERVICE_SID_INFO)] SERVICE_SID_INFO *sid; + [case(SERVICE_CONFIG_REQUIRED_PRIVILEGES_INFO)] SERVICE_RPC_REQUIRED_PRIVILEGES_INFO *privinfo; + [case(SERVICE_CONFIG_PRESHUTDOWN_INFO)] SERVICE_PRESHUTDOWN_INFO *preshutdown; + }; +} SC_RPC_CONFIG_INFOW; /* Compatible with Windows function 0x00 */ DWORD svcctl_CloseServiceHandle( @@ -331,11 +354,10 @@ typedef [switch_type(DWORD)] union /* Not compatible with Windows function 0x24 */ DWORD svcctl_ChangeServiceConfig2A(/* FIXME */); - /* Untested with Windows function 0x25 */ + /* Compatible with Windows function 0x25 */ DWORD svcctl_ChangeServiceConfig2W( [in] SC_RPC_HANDLE hService, - [in] DWORD InfoLevel, - [in,switch_is(InfoLevel)] SERVICE_CONFIG2W *config ); + [in] SC_RPC_CONFIG_INFOW config); /* Not compatible with Windows function 0x26 */ DWORD svcctl_QueryServiceConfig2A(/* FIXME */); diff --git a/programs/services/rpc.c b/programs/services/rpc.c index 3955e09..34d012d 100644 --- a/programs/services/rpc.c +++ b/programs/services/rpc.c @@ -755,7 +755,7 @@ DWORD __cdecl svcctl_SetServiceStatus( return ERROR_SUCCESS; } -DWORD __cdecl svcctl_ChangeServiceConfig2W( SC_RPC_HANDLE hService, DWORD level, SERVICE_CONFIG2W *config ) +DWORD __cdecl svcctl_ChangeServiceConfig2W( SC_RPC_HANDLE hService, SC_RPC_CONFIG_INFOW config ) { struct sc_service_handle *service; DWORD err; @@ -763,15 +763,15 @@ DWORD __cdecl svcctl_ChangeServiceConfig2W( SC_RPC_HANDLE hService, DWORD level, if ((err = validate_service_handle(hService, SERVICE_CHANGE_CONFIG, &service)) != 0) return err; - switch (level) + switch (config.dwInfoLevel) { case SERVICE_CONFIG_DESCRIPTION: { WCHAR *descr = NULL; - if (config->descr.lpDescription[0]) + if (config.descr->lpDescription[0]) { - if (!(descr = strdupW( config->descr.lpDescription ))) + if (!(descr = strdupW( config.descr->lpDescription ))) return ERROR_NOT_ENOUGH_MEMORY; } @@ -785,20 +785,20 @@ DWORD __cdecl svcctl_ChangeServiceConfig2W( SC_RPC_HANDLE hService, DWORD level, break; case SERVICE_CONFIG_FAILURE_ACTIONS: WINE_FIXME( "SERVICE_CONFIG_FAILURE_ACTIONS not implemented: period %u msg %s cmd %s\n", - config->actions.dwResetPeriod, - wine_dbgstr_w(config->actions.lpRebootMsg), - wine_dbgstr_w(config->actions.lpCommand) ); + config.actions->dwResetPeriod, + wine_dbgstr_w(config.actions->lpRebootMsg), + wine_dbgstr_w(config.actions->lpCommand) ); break; case SERVICE_CONFIG_PRESHUTDOWN_INFO: WINE_TRACE( "changing service %p preshutdown timeout to %d\n", - service, config->preshutdown.dwPreshutdownTimeout ); + service, config.preshutdown->dwPreshutdownTimeout ); service_lock_exclusive( service->service_entry ); - service->service_entry->preshutdown_timeout = config->preshutdown.dwPreshutdownTimeout; + service->service_entry->preshutdown_timeout = config.preshutdown->dwPreshutdownTimeout; save_service_config( service->service_entry ); service_unlock( service->service_entry ); break; default: - WINE_FIXME("level %u not implemented\n", level); + WINE_FIXME("level %u not implemented\n", config.dwInfoLevel); err = ERROR_INVALID_LEVEL; break; }

1 0

Nikolay Sivov : services: Pass resume index to server.
by Alexandre Julliard 25 Feb '15

25 Feb '15

Module: wine Branch: master Commit: c0b0d3b4e25c01cf3ab734882af6b82589e9a53c URL: http://source.winehq.org/git/wine.git/?a=commit;h=c0b0d3b4e25c01cf3ab734882… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Feb 25 09:07:59 2015 +0300 services: Pass resume index to server. --- dlls/advapi32/service.c | 5 +---- include/wine/svcctl.idl | 5 +++-- programs/services/rpc.c | 8 ++++++-- 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/dlls/advapi32/service.c b/dlls/advapi32/service.c index e0f7312..ae002c9 100644 --- a/dlls/advapi32/service.c +++ b/dlls/advapi32/service.c @@ -1619,9 +1619,6 @@ EnumServicesStatusW( SC_HANDLE hmngr, DWORD type, DWORD state, LPENUM_SERVICE_ST TRACE("%p 0x%x 0x%x %p %u %p %p %p\n", hmngr, type, state, services, size, needed, returned, resume_handle); - if (resume_handle) - FIXME("resume handle not supported\n"); - if (!hmngr) { SetLastError( ERROR_INVALID_HANDLE ); @@ -1637,7 +1634,7 @@ EnumServicesStatusW( SC_HANDLE hmngr, DWORD type, DWORD state, LPENUM_SERVICE_ST __TRY { - err = svcctl_EnumServicesStatusW( hmngr, type, state, (BYTE *)services, size, needed, returned ); + err = svcctl_EnumServicesStatusW( hmngr, type, state, (BYTE *)services, size, needed, returned, resume_handle ); } __EXCEPT(rpc_filter) { diff --git a/include/wine/svcctl.idl b/include/wine/svcctl.idl index b5a8c4d..7409b17 100644 --- a/include/wine/svcctl.idl +++ b/include/wine/svcctl.idl @@ -253,7 +253,7 @@ typedef struct _SC_RPC_CONFIG_INFOW { /* Not compatible with Windows function 0x0d */ DWORD svcctl_EnumDependentServicesW(/* FIXME */); - /* Not compatible with Windows function 0x0e */ + /* Compatible with Windows function 0x0e */ DWORD svcctl_EnumServicesStatusW( [in] SC_RPC_HANDLE hmngr, [in] DWORD type, @@ -261,7 +261,8 @@ typedef struct _SC_RPC_CONFIG_INFOW { [out,size_is(size)] BYTE *buffer, [in] DWORD size, [out] LPDWORD needed, - [out] LPDWORD returned + [out] LPDWORD returned, + [in,out,unique] LPDWORD resume ); /* Compatible with Windows function 0x0f */ diff --git a/programs/services/rpc.c b/programs/services/rpc.c index 34d012d..3a206c7 100644 --- a/programs/services/rpc.c +++ b/programs/services/rpc.c @@ -1276,7 +1276,8 @@ DWORD __cdecl svcctl_EnumServicesStatusW( BYTE *buffer, DWORD size, LPDWORD needed, - LPDWORD returned) + LPDWORD returned, + LPDWORD resume) { DWORD err, sz, total_size, num_services; DWORD_PTR offset; @@ -1284,7 +1285,7 @@ DWORD __cdecl svcctl_EnumServicesStatusW( struct service_entry *service; ENUM_SERVICE_STATUSW *s; - WINE_TRACE("(%p, 0x%x, 0x%x, %p, %u, %p, %p)\n", hmngr, type, state, buffer, size, needed, returned); + WINE_TRACE("(%p, 0x%x, 0x%x, %p, %u, %p, %p, %p)\n", hmngr, type, state, buffer, size, needed, returned, resume); if (!type || !state) return ERROR_INVALID_PARAMETER; @@ -1292,6 +1293,9 @@ DWORD __cdecl svcctl_EnumServicesStatusW( if ((err = validate_scm_handle(hmngr, SC_MANAGER_ENUMERATE_SERVICE, &manager)) != ERROR_SUCCESS) return err; + if (resume) + WINE_FIXME("resume index not supported\n"); + scmdatabase_lock_exclusive(manager->db); total_size = num_services = 0;

1 0

Nikolay Sivov : po: Update Russian translation.
by Alexandre Julliard 25 Feb '15

25 Feb '15

Module: wine Branch: master Commit: 0f12a90e64cd2faaef5acb8213cdac80c8e39227 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0f12a90e64cd2faaef5acb821… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Feb 25 10:04:29 2015 +0300 po: Update Russian translation. --- po/ru.po | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/po/ru.po b/po/ru.po index d6640e2..9d312e9 100644 --- a/po/ru.po +++ b/po/ru.po @@ -2731,11 +2731,6 @@ msgstr "" "Вы действительно хотите удалить его?" #: cryptui.rc:113 -#, fuzzy -#| msgid "" -#| "You will no longer be able to encrypt messages with these certificates, " -#| "or verify messages signed with it.\n" -#| "Are you sure you want to remove these certificates?" msgid "" "You will no longer be able to encrypt messages with these certificates, or " "verify messages signed with them.\n" @@ -3148,8 +3143,6 @@ msgid "&View Source" msgstr "&Открыть исходный текст" #: hhctrl.rc:83 -#, fuzzy -#| msgid "Properties" msgid "Proper&ties" msgstr "Сво&йства" @@ -11519,10 +11512,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 "" @@ -11530,10 +11521,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